ci: benchmark per-shard builds

Author: NickSdot

.github/actions/ccache/action.yml

@@ -58,8 +58,7 @@ runs:
         save: >-
           ${{ inputs.save == 'true'
               && (github.event_name == 'push'
-                  || github.event_name == 'schedule'
-                  || github.event_name == 'workflow_dispatch') }}
+                  || github.event_name == 'schedule') }}
     - name: Export CC/CXX
       shell: bash
       env:

.github/matrix.php

@@ -201,7 +201,7 @@ function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $re
 $repository = $argv[5] ?? null;
 $normal_ci_experiment = $trigger === 'workflow_dispatch'
     && $repository === 'NickSdot/php__php-src'
-    && $branch === 'experiment/ci-build-artifacts';
+    && in_array($branch, ['experiment/ci-build-artifacts', 'experiment/ci-local-builds-v2'], true);
 $matrix_trigger = $normal_ci_experiment ? 'pull_request' : $trigger;
 $nightly = ($trigger === 'schedule' || $trigger === 'workflow_dispatch')
     && !$normal_ci_experiment;

.github/workflows/test-suite.yml

@@ -52,52 +52,8 @@ jobs:
             --asan -x
       - name: Extra tests
         uses: ./.github/actions/extra-tests
-  ALPINE_BUILD:
-    if: ${{ fromJson(inputs.branch).jobs.ALPINE && !inputs.all_variations }}
-    name: ALPINE_X64_ASAN_DBG_ZTS_BUILD
-    runs-on: ubuntu-24.04
-    timeout-minutes: 60
-    container:
-      image: 'alpine:3.22'
-    steps:
-      - name: git checkout
-        uses: actions/checkout@v6
-        with:
-          ref: ${{ fromJson(inputs.branch).ref }}
-      - name: apk
-        uses: ./.github/actions/apk
-      - name: ccache
-        uses: ./.github/actions/ccache
-        with:
-          name: ALPINE
-          cc: clang-20
-          cxx: clang++-20
-          source_sha: ${{ fromJson(inputs.branch).sha }}
-          save: true
-      - name: ./configure
-        uses: ./.github/actions/configure-alpine
-        with:
-          configurationParameters: >-
-            CFLAGS="-fsanitize=undefined,address -fno-sanitize=function -DZEND_TRACK_ARENA_ALLOC"
-            LDFLAGS="-fsanitize=undefined,address -fno-sanitize=function"
-            --enable-debug
-            --enable-zts
-          skipSlow: true
-      - name: make
-        run: make -j$(/usr/bin/nproc) >/dev/null
-      - name: Stage PHP installation
-        run: make install INSTALL_ROOT="$RUNNER_TEMP/php-install-root" >/dev/null
-      - name: Upload PHP build
-        uses: ./.github/actions/upload-build-artifact
-        with:
-          name: php-build-alpine-${{ join(fromJson(inputs.branch).version, '.') }}
-          source_sha: ${{ fromJson(inputs.branch).sha }}
   ALPINE:
-    needs: ALPINE_BUILD
-    if: >-
-      ${{ always()
-          && fromJson(inputs.branch).jobs.ALPINE
-          && (inputs.all_variations || needs.ALPINE_BUILD.result == 'success') }}
+    if: ${{ fromJson(inputs.branch).jobs.ALPINE }}
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(inputs.branch).jobs.ALPINE.matrix }}
@@ -122,7 +78,6 @@ jobs:
           apk list
           echo "::endgroup::"
       - name: ccache
-        if: ${{ inputs.all_variations }}
         uses: ./.github/actions/ccache
         with:
           name: "${{ github.job }}"
@@ -131,7 +86,6 @@ jobs:
           source_sha: ${{ fromJson(inputs.branch).sha }}
           save: ${{ matrix.test_shard == 1 && 'true' || 'false' }}
       - name: ./configure
-        if: ${{ inputs.all_variations }}
         uses: ./.github/actions/configure-alpine
         with:
           configurationParameters: >-
@@ -141,22 +95,9 @@ jobs:
             --enable-zts
           skipSlow: true # FIXME: This should likely include slow extensions
       - name: make
-        if: ${{ inputs.all_variations }}
         run: make -j$(/usr/bin/nproc) >/dev/null
-      - name: Download PHP build
-        if: ${{ !inputs.all_variations }}
-        uses: ./.github/actions/download-build-artifact
-        with:
-          name: php-build-alpine-${{ join(fromJson(inputs.branch).version, '.') }}
-          source_sha: ${{ fromJson(inputs.branch).sha }}
       - name: make install
-        if: ${{ inputs.all_variations }}
         uses: ./.github/actions/install-alpine
-      - name: Configure installed PHP
-        if: ${{ !inputs.all_variations }}
-        run: |
-          sudo mkdir -p /etc/php.d
-          sudo chmod 777 /etc/php.d
       - name: Test Tracing JIT
         uses: ./.github/actions/test-alpine
         with:
@@ -169,52 +110,8 @@ jobs:
       - name: Extra tests
         if: ${{ matrix.test_shard == 1 }}
         uses: ./.github/actions/extra-tests
-  LINUX_X64_ASAN_BUILD:
-    if: ${{ fromJson(inputs.branch).jobs.LINUX_X64.asan_matrix }}
-    name: LINUX_X64_ASAN_DBG_ZTS_BUILD
-    runs-on: ubuntu-${{ fromJson(inputs.branch).config.ubuntu_version }}
-    timeout-minutes: 60
-    steps:
-      - name: git checkout
-        uses: actions/checkout@v6
-        with:
-          ref: ${{ fromJson(inputs.branch).ref }}
-      - name: apt
-        uses: ./.github/actions/apt-x64
-        with:
-          asan: true
-          skipSlow: true
-      - name: ccache
-        uses: ./.github/actions/ccache
-        with:
-          name: LINUX_X64_ASAN_DEBUG_ZTS
-          source_sha: ${{ fromJson(inputs.branch).sha }}
-          save: true
-      - name: ./configure
-        uses: ./.github/actions/configure-x64
-        with:
-          configurationParameters: >-
-            CFLAGS="-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC"
-            LDFLAGS="-fsanitize=undefined,address"
-            --enable-debug
-            --enable-zts
-          asan: true
-          skipSlow: true
-      - name: make
-        run: make -j$(/usr/bin/nproc) >/dev/null
-      - name: Stage PHP installation
-        run: make install INSTALL_ROOT="$RUNNER_TEMP/php-install-root" >/dev/null
-      - name: Upload PHP build
-        uses: ./.github/actions/upload-build-artifact
-        with:
-          name: php-build-linux-x64-asan-${{ join(fromJson(inputs.branch).version, '.') }}
-          source_sha: ${{ fromJson(inputs.branch).sha }}
   LINUX_X64_ASAN:
-    needs: LINUX_X64_ASAN_BUILD
-    if: >-
-      ${{ always()
-          && fromJson(inputs.branch).jobs.LINUX_X64.asan_matrix
-          && needs.LINUX_X64_ASAN_BUILD.result == 'success' }}
+    if: ${{ fromJson(inputs.branch).jobs.LINUX_X64.asan_matrix }}
     services:
       mysql:
         image: mysql:8.4
@@ -249,17 +146,26 @@ jobs:
           echo "::endgroup::"
       - name: Setup Caddy server
         uses: ./.github/actions/setup-caddy
-      - name: Download PHP build
-        uses: ./.github/actions/download-build-artifact
+      - name: ccache
+        uses: ./.github/actions/ccache
         with:
-          name: php-build-linux-x64-asan-${{ join(fromJson(inputs.branch).version, '.') }}
+          name: LINUX_X64_ASAN_DEBUG_ZTS
           source_sha: ${{ fromJson(inputs.branch).sha }}
-      - name: Configure installed PHP
-        run: |
-          sudo mkdir -p /etc/php.d
-          sudo chmod 777 /etc/php.d
-          echo mysqli.default_socket=/var/run/mysqld/mysqld.sock | sudo tee /etc/php.d/mysqli.ini
-          echo pdo_mysql.default_socket=/var/run/mysqld/mysqld.sock | sudo tee /etc/php.d/pdo_mysql.ini
+          save: ${{ matrix.test_shard == 1 && 'true' || 'false' }}
+      - name: ./configure
+        uses: ./.github/actions/configure-x64
+        with:
+          configurationParameters: >-
+            CFLAGS="-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC"
+            LDFLAGS="-fsanitize=undefined,address"
+            --enable-debug
+            --enable-zts
+          asan: true
+          skipSlow: true
+      - name: make
+        run: make -j$(/usr/bin/nproc) >/dev/null
+      - name: make install
+        uses: ./.github/actions/install-linux
       - name: Test Tracing JIT
         uses: ./.github/actions/test-linux
         with:
@@ -1029,9 +935,6 @@ jobs:
         uses: ./.github/actions/verify-generated-files
   WINDOWS:
     if: ${{ fromJson(inputs.branch).jobs.WINDOWS }}
-    permissions:
-      actions: read
-      contents: read
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(inputs.branch).jobs.WINDOWS.matrix }}
@@ -1065,9 +968,7 @@ jobs:
         with:
           ref: ${{ fromJson(inputs.branch).ref }}
       - name: Get checked-out commit
-        if: >-
-          ${{ fromJson(inputs.branch).jobs.WINDOWS.config.parallel_build
-              && (inputs.all_variations || matrix.test_shard == 1) }}
+        if: ${{ fromJson(inputs.branch).jobs.WINDOWS.config.parallel_build }}
         shell: pwsh
         run: |
           $sourceSha = git rev-parse HEAD
@@ -1077,14 +978,11 @@ jobs:
         if: ${{ !fromJson(inputs.branch).jobs.WINDOWS.config.parallel_build }}
         uses: ./.github/actions/setup-windows
       - name: Setup Windows build tools
-        if: >-
-          ${{ fromJson(inputs.branch).jobs.WINDOWS.config.parallel_build
-              && (inputs.all_variations || matrix.test_shard == 1) }}
+        if: ${{ fromJson(inputs.branch).jobs.WINDOWS.config.parallel_build }}
         uses: ./.github/actions/setup-windows
       - name: Restore MSVC compiler cache
         if: >-
           ${{ fromJson(inputs.branch).jobs.WINDOWS.config.parallel_build
-              && (inputs.all_variations || matrix.test_shard == 1)
               && !matrix.clang }}
         continue-on-error: true
         uses: actions/cache/restore@caa296126883cff596d87d8935842f9db880ef25 # v5.1.0
@@ -1095,9 +993,7 @@ jobs:
             ${{ env.SCCACHE_CACHE_RESTORE_PREFIX }}
             ${{ env.SCCACHE_CACHE_LEGACY_RESTORE_PREFIX }}
       - name: Build PHP while preparing test databases
-        if: >-
-          ${{ fromJson(inputs.branch).jobs.WINDOWS.config.parallel_build
-              && (inputs.all_variations || matrix.test_shard == 1) }}
+        if: ${{ fromJson(inputs.branch).jobs.WINDOWS.config.parallel_build }}
         shell: pwsh
         run: .github/scripts/windows/build_with_test_database_setup.ps1
       - name: Build PHP
@@ -1106,44 +1002,15 @@ jobs:
       - name: Save MSVC compiler cache
         if: >-
           ${{ fromJson(inputs.branch).jobs.WINDOWS.config.parallel_build
-              && inputs.all_variations
               && !matrix.clang
               && matrix.test_shard == 1
               && (github.event_name == 'push'
-                  || github.event_name == 'schedule'
-                  || github.event_name == 'workflow_dispatch') }}
+                  || github.event_name == 'schedule') }}
         continue-on-error: true
         uses: actions/cache/save@caa296126883cff596d87d8935842f9db880ef25 # v5.1.0
         with:
           path: ${{ runner.temp }}\sccache
           key: ${{ env.SCCACHE_CACHE_KEY }}
-      - name: Upload PHP build
-        if: >-
-          ${{ fromJson(inputs.branch).jobs.WINDOWS.config.parallel_build
-              && !inputs.all_variations
-              && matrix.test_shard == 1 }}
-        uses: ./.github/actions/upload-build-artifact
-        with:
-          name: php-build-windows-${{ join(fromJson(inputs.branch).version, '.') }}-${{ fromJson(inputs.branch).jobs.WINDOWS.config.vs_crt_version }}-x64-zts
-          source_sha: ${{ fromJson(inputs.branch).sha }}
-      - name: Download PHP build while preparing test databases
-        if: >-
-          ${{ fromJson(inputs.branch).jobs.WINDOWS.config.parallel_build
-              && !inputs.all_variations
-              && matrix.test_shard != 1 }}
-        shell: pwsh
-        env:
-          GH_TOKEN: ${{ github.token }}
-          PHP_BUILD_ARTIFACT_NAME: php-build-windows-${{ join(fromJson(inputs.branch).version, '.') }}-${{ fromJson(inputs.branch).jobs.WINDOWS.config.vs_crt_version }}-x64-zts
-          PHP_BUILD_SOURCE_SHA: ${{ fromJson(inputs.branch).sha }}
-          PHP_BUILD_PRODUCER_JOB: WINDOWS_X64_ZTS_1-2
-        run: |
-          $parameters = @{
-            ArtifactName = $env:PHP_BUILD_ARTIFACT_NAME
-            SourceSha = $env:PHP_BUILD_SOURCE_SHA
-            ProducerJobName = $env:PHP_BUILD_PRODUCER_JOB
-          }
-          .github/scripts/windows/download_build_with_test_database_setup.ps1 @parameters
       - name: Test
         run: .github/scripts/windows/test.bat
   FREEBSD:

.github/workflows/test.yml

@@ -37,7 +37,7 @@ jobs:
     if: github.repository == 'php/php-src' || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
     runs-on: ubuntu-latest
     env:
-      NORMAL_CI_EXPERIMENT: ${{ github.repository == 'NickSdot/php__php-src' && github.event_name == 'workflow_dispatch' && github.ref_name == 'experiment/ci-build-artifacts' }}
+      NORMAL_CI_EXPERIMENT: ${{ github.repository == 'NickSdot/php__php-src' && github.event_name == 'workflow_dispatch' && (github.ref_name == 'experiment/ci-build-artifacts' || github.ref_name == 'experiment/ci-local-builds-v2') }}
     outputs:
       all_variations: ${{ steps.set-matrix.outputs.all_variations }}
       branches: ${{ steps.set-matrix.outputs.branches }}