Add support for arm builds [skip ci]

shivammathur · shivammathur · commit d528fb9a5c14 · 2025-01-17T18:07:13.000Z
diff --git a/.github/workflows/cache-nightly.yml b/.github/workflows/cache-nightly.yml
@@ -1,20 +1,61 @@
 name: Cache PHP for nightly versions
 on:
   push:
-  workflow_dispatch:
   schedule:
     - cron: '0 4 1-31/2 * *'
+  workflow_dispatch:
+    inputs:
+      php-versions:
+        description: 'PHP version to build'
+        default: '8.5'
+        required: false
+      builds:
+        description: 'Build type'
+        default: 'debug release'
+        required: false
+      ts:
+        description: 'Type safety'
+        default: 'nts zts'
+        required: false
+      containers:
+        description: 'OS containers'
+        default: 'ubuntu:24.04 ubuntu:22.04 ubuntu:20.04 arm64v8/ubuntu:22.04 arm64v8/ubuntu:24.04'
+        required: false
+
+env:
+  PHP_VERSIONS: '8.5'
+  BUILDS: 'debug release'
+  TS: 'nts zts'
+  CONTAINERS: 'ubuntu:24.04 ubuntu:22.04 ubuntu:20.04 arm64v8/ubuntu:22.04 arm64v8/ubuntu:24.04'
+  BASE_OS: ubuntu-24.04
+  BASE_OS_ARM: ubuntu-24.04-arm
+
 jobs:
-  cache:
-    container: ubuntu:${{ matrix.container }}
+  get-matrix:
     runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.get-matrix.outputs.matrix }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Get Matrix
+        id: get-matrix
+        run: bash scripts/get-matrix.sh
+        env:
+          PHP_VERSIONS: ${{ inputs.php-versions || env.PHP_VERSIONS }}
+          BUILDS: ${{ inputs.builds || env.BUILDS }}
+          TS: ${{ inputs.ts || env.TS }}
+          CONTAINERS: ${{ inputs.containers || env.CONTAINERS }}
+          BASE_OS: ${{ env.BASE_OS }}
+          BASE_OS_ARM: ${{ env.BASE_OS_ARM }}
+  cache:
+    needs: get-matrix
+    container: ${{ matrix.container }}
+    runs-on: ${{ matrix.container-base }}
     strategy:
       fail-fast: false
-      matrix:
-        container: [24.04, 22.04, 20.04]
-        php-versions: ['8.5']
-        builds: ['debug', 'release']
-        ts: [zts, nts]
+      matrix: ${{fromJson(needs.get-matrix.outputs.matrix)}}
     if: "!contains(github.event.head_commit.message, 'skip-nightly-cache')"
     steps:
       - name: Checkout
@@ -63,18 +104,14 @@ jobs:
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
-          name: ubuntu-${{ matrix.container }}-${{ matrix.php-versions }}-${{ matrix.builds }}-${{ matrix.ts }}
+          name: ${{ matrix.os }}-${{ matrix.php-versions }}-${{ matrix.builds }}-${{ matrix.ts }}
           path: builds
   tests:
     runs-on: ${{ matrix.os }}
-    needs: cache
+    needs: [get-matrix, cache]
     strategy:
       fail-fast: false
-      matrix:
-        os: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04]
-        php-versions: ['8.5']
-        builds: ['debug', 'release']
-        ts: [nts, zts]
+      matrix: ${{fromJson(needs.get-matrix.outputs.matrix)}}
     if: "!contains(github.event.head_commit.message, 'skip-tests')"
     steps:
       - name: Checkout
@@ -121,7 +158,7 @@ jobs:
         run: sudo apt-get check      
   release:
     runs-on: ubuntu-latest
-    needs: [cache, tests]
+    needs: [get-matrix, cache, tests]
     if: "!contains(github.event.head_commit.message, 'skip-release')"
     steps:
       - name: Checkout
diff --git a/.github/workflows/cache-stable.yml b/.github/workflows/cache-stable.yml
@@ -17,14 +17,16 @@ on:
         required: false
       containers:
         description: 'OS containers'
-        default: '24.04 22.04 20.04'
+        default: 'ubuntu:24.04 ubuntu:22.04 ubuntu:20.04 arm64v8/ubuntu:22.04 arm64v8/ubuntu:24.04'
         required: false
 
 env:
   PHP_VERSIONS: '5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4'
   BUILDS: 'debug release'
   TS: 'nts zts'
-  CONTAINERS: '24.04 22.04 20.04'
+  CONTAINERS: 'ubuntu:24.04 ubuntu:22.04 ubuntu:20.04 arm64v8/ubuntu:22.04 arm64v8/ubuntu:24.04'
+  BASE_OS: ubuntu-24.04
+  BASE_OS_ARM: ubuntu-24.04-arm
 
 jobs:
   get-matrix:
@@ -43,10 +45,12 @@ jobs:
           BUILDS: ${{ inputs.builds || env.BUILDS }}
           TS: ${{ inputs.ts || env.TS }}
           CONTAINERS: ${{ inputs.containers || env.CONTAINERS }}
+          BASE_OS: ${{ env.BASE_OS }}
+          BASE_OS_ARM: ${{ env.BASE_OS_ARM }}
   cache:
     needs: get-matrix
-    container: ubuntu:${{ matrix.container }}
-    runs-on: ubuntu-latest
+    container: ${{ matrix.container }}
+    runs-on: ${{ matrix.container-base }}
     strategy:
       fail-fast: false
       matrix: ${{fromJson(needs.get-matrix.outputs.matrix)}}
@@ -61,7 +65,7 @@ jobs:
           PHP_VERSION: ${{ matrix.php-versions }}
           BUILDS: ${{ matrix.builds }}
           NIGHTLY: 'false'
-          TS: ${{ matrix.ts }}          
+          TS: ${{ matrix.ts }}
 
       - name: Get ZSTD_DIR
         id: zstd
@@ -98,7 +102,7 @@ jobs:
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
-          name: ubuntu-${{ matrix.container }}-${{ matrix.php-versions }}-${{ matrix.builds }}-${{ matrix.ts }}
+          name: ${{ matrix.os }}-${{ matrix.php-versions }}-${{ matrix.builds }}-${{ matrix.ts }}
           path: builds
   tests:
     runs-on: ${{ matrix.os }}
diff --git a/scripts/configure-git.sh b/scripts/configure-git.sh
@@ -4,6 +4,8 @@ touch /run/php/.gitkeep
 
 git config --global user.email "you@example.com"
 git init
-git add /bin /lib /lib64 /sbin /usr /var /run/php
+for dir_path in /bin /lib /lib64 /sbin /usr /var /run/php; do
+  [ -d "$dir_path" ] && git add "$dir_path"
+done
 find /etc -maxdepth 1 -mindepth 1 -type d -exec git add {} \;
 git commit -m "init"
diff --git a/scripts/get-matrix.sh b/scripts/get-matrix.sh
@@ -7,11 +7,21 @@ IFS=' ' read -r -a build_array <<<"${BUILDS:?}"
 IFS=' ' read -r -a ts_array <<<"${TS:?}"
 IFS=' ' read -r -a container_array <<<"${CONTAINERS:?}"
 
+get_container_base() {
+  [[ $1 = *arm64v8* ]] && echo "${BASE_OS_ARM:?}" || echo "${BASE_OS:?}"
+}
+
+get_os_version() {
+  [[ $1 = *arm64v8* ]] && echo "${1##*:}-arm" || echo "${1##*:}"
+}
+
 for php in "${php_version_array[@]}"; do
   for build in "${build_array[@]}"; do
     for ts in "${ts_array[@]}"; do
-      for container in "${container_array[@]}"; do
-        json_array+=("{\"php-versions\": \"$php\", \"builds\": \"$build\", \"ts\": \"$ts\", \"container\": \"$container\", \"os\": \"ubuntu-${container}\" }")
+      for os in "${container_array[@]}"; do
+        os_base="$(get_container_base "$os")"
+        os_version="ubuntu-$(get_os_version "$os")"
+        json_array+=("{\"php-versions\": \"$php\", \"builds\": \"$build\", \"ts\": \"$ts\", \"container\": \"$os\", \"container-base\": \"$os_base\", \"os\": \"$os_version\" }")
       done  
     done
   done
diff --git a/scripts/install-requirements-packages.sh b/scripts/install-requirements-packages.sh
@@ -3,7 +3,7 @@
 . ./scripts/packages.sh
 add_ppa
 
-DEBIAN_FRONTEND=noninteractive apt-get install -y apache2 apt-fast automake gcc g++ git jq make pkg-config shtool libtool sudo systemd unzip 
+DEBIAN_FRONTEND=noninteractive apt-get install -y apache2 apt-fast automake gcc g++ git jq make pkg-config shtool libtool sudo systemd unzip
 purge_packages libfile-fcntllock-perl libalgorithm-merge-perl libalgorithm-diff-xs-perl unattended-upgrades libalgorithm-diff-perl manpages-dev
 DEBIAN_FRONTEND=noninteractive apt-get install -y php"${PHP_VERSION:?}"-common php"${PHP_VERSION:?}"-imagick
 purge_packages php"${PHP_VERSION:?}"-imagick php"${PHP_VERSION:?}"-common php-common
diff --git a/scripts/install-requirements-php-builder.sh b/scripts/install-requirements-php-builder.sh
@@ -5,9 +5,10 @@
 add_ppa
 
 DEBIAN_FRONTEND=noninteractive apt-get install -y apache2 apt-fast automake gcc g++ git jq make pkg-config shtool libtool sudo systemd unzip
-DEBIAN_FRONTEND=noninteractive apt-get install -y autoconf firebird-dev freetds-dev libacl1-dev libapparmor-dev libargon2-dev libaspell-dev libc-client2007e-dev libcurl4-openssl-dev libdb-dev libedit-dev libgomp1 libicu-dev libkrb5-dev libldap-dev liblmdb-dev liblz4-dev libmemcached-dev libonig-dev libpq-dev libqdbm-dev librabbitmq-dev libsodium-dev libsnmp-dev libsqlite3-dev libtidy-dev libtool libwrap0-dev libxml2-dev libxslt1-dev libyaml-dev libzip-dev libzmq3-dev libzstd-dev make php-common snmp shtool systemd tzdata
+DEBIAN_FRONTEND=noninteractive apt-get install -y autoconf firebird-dev freetds-dev libacl1-dev libapparmor-dev libargon2-dev libaspell-dev libc-client2007e-dev libcurl4-openssl-dev libdb-dev libedit-dev libgomp1 libicu-dev libkrb5-dev libldap-dev liblmdb-dev liblz4-dev libmemcached-dev libonig-dev libpq-dev libqdbm-dev librabbitmq-dev libsodium-dev libsnmp-dev libsqlite3-dev libtidy-dev libtool libwrap0-dev libxml2-dev libxslt1-dev libyaml-dev libzip-dev libzmq3-dev make php-common snmp shtool systemd tzdata
 purge_packages libfile-fcntllock-perl libalgorithm-merge-perl libalgorithm-diff-xs-perl unattended-upgrades libalgorithm-diff-perl manpages-dev
 purge_packages libgd-dev uuid-dev libfreetype-dev libfribidi-dev libharfbuzz-dev libgd3 libavif13 libavif16 libimagequant0 libraqm0 libyuv0 libaom3 libdav1d5 libgav1-0 libabsl20210324 libdav1d7 libgav1-1 librav1e0 libsvtav1enc1d1 libabsl20220623t64 || true
-if [ "$VERSION_ID" != '24.04' ]; then
+arch="$(arch)"
+if [[ "$VERSION_ID" != '24.04' && "$arch" != "aarch64" && "$arch" != "arm64" ]]; then
   DEBIAN_FRONTEND=noninteractive apt-get install -y unixodbc
 fi
diff --git a/scripts/install.sh b/scripts/install.sh
@@ -73,7 +73,9 @@ version=$1
 builds=${2:-release}
 ts=${3:-nts}
 [ "${builds:?}" = "debug" ] && PHP_PKG_SUFFIX=-dbgsym
-tar_file=php_"$version-$ts$PHP_PKG_SUFFIX"+ubuntu"$VERSION_ID".tar.zst
+arch="$(arch)"
+[[ "$arch" = "aarch64" || "$arch" = "arm64" ]] && ARCH_SUFFIX='_arm64' || ARCH_SUFFIX=''
+tar_file=php_"$version-$ts$PHP_PKG_SUFFIX"+ubuntu"$VERSION_ID$ARCH_SUFFIX".tar.zst
 check_reload
 install
 fix_alternatives
diff --git a/scripts/package-php.sh b/scripts/package-php.sh
@@ -1,6 +1,9 @@
 cd / || exit 1
 [ "${BUILDS:?}" = "debug" ] && PHP_PKG_SUFFIX=-dbgsym
-git add /bin /lib /lib64 /sbin /usr /var /run/php
+ls -la /
+for dir_path in /bin /lib /lib64 /sbin /usr /var /run/php; do
+  [ -d "$dir_path" ] && git add "$dir_path"
+done
 find /etc -maxdepth 1 -mindepth 1 -type d -exec git add {} \;
 git commit -m "installed php"
 mkdir -p /tmp/php/etc/apt/sources.list.d /tmp/php/etc/apt/trusted.gpg.d /tmp/php/var/lib/apt/lists
@@ -9,25 +12,28 @@ for file in $(git log -p -n 1 --name-only | sed 's/^.*\(\s\).*$/\1/' | xargs -L1
     sudo cp -r -p --parents "$file" /tmp/php || true
   fi
 done
+lib_subdir="$(uname -m)-linux-gnu"
 sudo touch /var/lib/dpkg/status-diff
 sudo cp "$GITHUB_WORKSPACE"/scripts/required /tmp/required
 sudo LC_ALL=C.UTF-8 python3 "$GITHUB_WORKSPACE"/scripts/create_status.py
+sudo mkdir -p /tmp/php/usr/sbin /tmp/php/var/lib/dpkg/
 sudo cp /var/lib/dpkg/status-diff /tmp/php/var/lib/dpkg/
-sudo mkdir -p /tmp/php/usr/sbin
 sudo cp "$GITHUB_WORKSPACE"/scripts/merge_status.py /tmp/php/usr/sbin/merge_status
 cat /tmp/php/var/lib/dpkg/status-diff
 sudo cp /etc/apt/sources.list.d/ondrej* /tmp/php/etc/apt/sources.list.d/
 sudo cp /etc/apt/trusted.gpg.d/ondrej* /tmp/php/etc/apt/trusted.gpg.d/
 sudo cp /var/lib/apt/lists/*ondrej* /tmp/php/var/lib/apt/lists/
-sudo cp -a /usr/lib/x86_64-linux-gnu/libpcre* /tmp/php/usr/lib/x86_64-linux-gnu/
-sudo cp -a /lib/x86_64-linux-gnu/libpcre* /tmp/php/usr/lib/x86_64-linux-gnu/
+sudo cp -a /usr/lib/"$lib_subdir"/libpcre* /tmp/php/usr/lib/"$lib_subdir"/
+sudo cp -a /lib/"$lib_subdir"/libpcre* /tmp/php/usr/lib/"$lib_subdir"/
 sudo rm -rf /tmp/php/var/lib/dpkg/alternatives/* /tmp/php/var/lib/dpkg/status-old /tmp/php/var/lib/dpkg/status-orig
 . /etc/os-release
 SEMVER="$(php -v | head -n 1 | cut -f 2 -d ' ' | cut -f 1 -d '-')"
 (
   cd /tmp/php || exit 1
-  sudo tar cf - ./* | zstd -22 -T0 --ultra > ../php_"$PHP_VERSION-$TS$PHP_PKG_SUFFIX"+ubuntu"$VERSION_ID".tar.zst
-  cp ../php_"$PHP_VERSION-$TS$PHP_PKG_SUFFIX"+ubuntu"$VERSION_ID".tar.zst ../php_"$SEMVER-$TS$PHP_PKG_SUFFIX"+ubuntu"$VERSION_ID".tar.zst
+  arch="$(arch)"
+  [[ "$arch" = "aarch64" || "$arch" = "arm64" ]] && ARCH_SUFFIX='_arm64' || ARCH_SUFFIX=''
+  sudo tar cf - ./* | zstd -22 -T0 --ultra > ../php_"$PHP_VERSION-$TS$PHP_PKG_SUFFIX"+ubuntu"$VERSION_ID$ARCH_SUFFIX".tar.zst
+  cp ../php_"$PHP_VERSION-$TS$PHP_PKG_SUFFIX"+ubuntu"$VERSION_ID$ARCH_SUFFIX".tar.zst ../php_"$SEMVER-$TS$PHP_PKG_SUFFIX"+ubuntu"$VERSION_ID$ARCH_SUFFIX".tar.zst
 )
 cd "$GITHUB_WORKSPACE" || exit 1
 mkdir builds
