Compile without macOS & Android for now

dries-c · dries-c · commit 331e4bae19ed · 2025-09-28T01:20:51.000+02:00
diff --git a/.github/workflows/main-pm-matrix.yml b/.github/workflows/main-pm-matrix.yml
@@ -24,89 +24,6 @@ env:
   MUSL_CROSS_MAKE_VERSION: 43fcb1e63786b96add78f89d7454709ae0159fa0
 
 jobs:
-  android:
-    name: Android arm64
-    runs-on: ubuntu-22.04
-
-    steps:
-      - uses: actions/checkout@v5
-
-      - name: Install tools and dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install make autoconf automake libtool libtool-bin m4 wget libc-bin gzip bzip2 bison g++ git re2c
-
-      - name: Prepare compile.sh download cache
-        id: download-cache
-        uses: actions/cache@v4
-        with:
-          path: ./download_cache
-          key: compile-sh-cache-ssl-https-${{ hashFiles('./compile.sh') }}
-          restore-keys: compile-sh-cache-ssl-https-
-
-      - name: Fetch compiler cache
-        id: compiler-cache
-        uses: actions/cache@v4
-        with:
-          path: ${{ github.workspace }}/compiler
-          key: musl-cross-make-${{ env.MUSL_CROSS_MAKE_VERSION }}
-
-      - name: Checkout musl-cross-make
-        if: steps.compiler-cache.outputs.cache-hit != 'true'
-        uses: actions/checkout@v5
-        with:
-          repository: pmmp/musl-cross-make
-          path: musl-cross-make
-          ref: ${{ env.MUSL_CROSS_MAKE_VERSION }}
-
-      - name: Build compiler
-        if: steps.compiler-cache.outputs.cache-hit != 'true'
-        working-directory: musl-cross-make
-        run: |
-          echo "TARGET = aarch64-linux-musl" > config.mak
-          make -j$(nproc)
-          make install
-          mv ./output "${{ github.workspace }}/compiler"
-
-      - name: Compile PHP
-        run: |
-          export PATH="${{ github.workspace }}/compiler/bin:$PATH"
-
-          # Used "set -ex" instead of hashbang since script isn't executed with hashbang
-          set -ex
-          trap "exit 1" ERR
-          ./compile.sh -t android-aarch64 -x -j 4 -g -P ${{ inputs.pm-version-major }} -c ./download_cache -D -z ${{ inputs.php-version-base }}
-        
-      
-      - name: Create tarball
-        run: |
-          tar -czf ./PHP-${{ inputs.php-version-base }}-Android-arm64-PM${{ inputs.pm-version-major }}.tar.gz bin
-          tar -czf ./Z-PHP-${{ inputs.php-version-base }}-Android-arm64-PM${{ inputs.pm-version-major }}-debugging-symbols.tar.gz bin-debug
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: PHP-${{ inputs.php-version-base }}-Android-PM${{ inputs.pm-version-major }}
-          path: |
-            ./*PHP-${{ inputs.php-version-base }}-Android-arm64-PM${{ inputs.pm-version-major }}*.tar.gz
-            install.log
-            compile.sh
-          if-no-files-found: error
-
-      - name: Prepare workspace for upload
-        if: failure()
-        run: tar -czf workspace.tar.gz install_data
-
-      - name: Upload workspace
-        uses: actions/upload-artifact@v4
-        if: failure()
-        with:
-          name: PHP-${{ inputs.php-version-base }}-Android-workspace-PM${{ inputs.pm-version-major }}
-          path: |
-            workspace.tar.gz
-          if-no-files-found: error
-
   linux:
     name: Linux
     runs-on: ubuntu-22.04
@@ -163,72 +80,6 @@ jobs:
             workspace.tar.gz
           if-no-files-found: error
 
-  macos:
-    name: MacOS ${{ matrix.artifact-name }}
-    runs-on: ${{ matrix.image }}
-    strategy:
-      matrix:
-        include:
-          - target-name: mac-x86-64
-            artifact-name: x86_64
-            image: macos-13
-          - target-name: mac-arm64
-            artifact-name: arm64
-            image: macos-14
-
-    steps:
-      - uses: actions/checkout@v5
-      
-      - name: Install tools and dependencies
-        run: |
-          #workaround github actions default image providing outdated pkg-config
-          brew uninstall --ignore-dependencies --force pkg-config@0.29.2 || true
-          brew install libtool autoconf automake pkg-config bison re2c
-
-      - name: Prepare compile.sh download cache
-        id: download-cache
-        uses: actions/cache@v4
-        with:
-          path: ./download_cache
-          key: compile-sh-cache-ssl-https-${{ hashFiles('./compile.sh') }}
-          restore-keys: compile-sh-cache-ssl-https-
-
-      - name: Compile PHP
-        run: |
-          export PATH="/usr/local/opt/bison/bin:$PATH"
-          set -ex
-          trap "exit 1" ERR
-          ./compile.sh -t ${{ matrix.target-name }} -j4 -g -P ${{ inputs.pm-version-major }} -c ./download_cache -D -z ${{ inputs.php-version-base }}
-          
-      - name: Create tarball
-        run: |
-          tar -czf ./PHP-${{ inputs.php-version-base }}-MacOS-${{ matrix.artifact-name }}-PM${{ inputs.pm-version-major }}.tar.gz bin
-          tar -czf ./Z-PHP-${{ inputs.php-version-base }}-MacOS-${{ matrix.artifact-name }}-PM${{ inputs.pm-version-major }}-debugging-symbols.tar.gz bin-debug
-        
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: PHP-${{ inputs.php-version-base }}-MacOS-${{ matrix.artifact-name }}-PM${{ inputs.pm-version-major }}
-          path: |
-            ./*PHP-${{ inputs.php-version-base }}-MacOS-${{ matrix.artifact-name}}-PM${{ inputs.pm-version-major }}*.tar.gz
-            install.log
-            compile.sh
-          if-no-files-found: error
-
-      - name: Prepare workspace for upload
-        if: failure()
-        run: tar -czf workspace.tar.gz install_data
-
-      - name: Upload workspace
-        uses: actions/upload-artifact@v4
-        if: failure()
-        with:
-          name: PHP-${{ inputs.php-version-base }}-MacOS-${{ matrix.artifact-name }}-workspace-PM${{ inputs.pm-version-major }}
-          path: |
-            workspace.tar.gz
-          if-no-files-found: error
-
   windows:
     name: Windows
     runs-on: windows-2022
diff --git a/windows-compile-vs.ps1 b/windows-compile-vs.ps1
@@ -389,8 +389,8 @@ function build-grpc {
     write-install
     sdk-command "cmake -P cmake_install.cmake || exit 1"
 
-    Move-Item "third_party\protobuf\php\ext\google\protobuf" "$SOURCES_PATH\php-src\ext\protobuf" >> $log_file 2>&1
-    Move-Item "third_party\protobuf\third_party" "$SOURCES_PATH\php-src\ext\protobuf\third_party" >> $log_file 2>&1
+    Move-Item "third_party\protobuf\php\ext\google\protobuf" "$SOURCES_PATH\ext\protobuf" >> $log_file 2>&1
+    Move-Item "third_party\protobuf\third_party" "$SOURCES_PATH\ext\protobuf\third_party" >> $log_file 2>&1
 
 @"
 ARG_ENABLE("protobuf", "Enable Protobuf extension", "yes");
@@ -402,7 +402,7 @@ if (PHP_PROTOBUF != "no") {
 
   AC_DEFINE('HAVE_PROTOBUF', 1, '');
 }
-"@ | Out-File -Encoding ascii -FilePath $SOURCES_PATH\php-src\ext\protobuf\config.w32
+"@ | Out-File -Encoding ascii -FilePath $SOURCES_PATH\ext\protobuf\config.w32
 
     write-done
     Pop-Location
