[php-src] master: Merge branch 'PHP-8.5'

From: Date: Thu, 23 Jul 2026 19:18:18 +0000
Subject: [php-src] master: Merge branch 'PHP-8.5'
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-140184@lists.php.net to get a copy of this message
Author: Ilija Tovilo (iluuu1994) Date: 2026-07-23T21:17:51+02:00 Commit: https://github.com/php/php-src/commit/1f4a88c5c382af95a534475fa7a74c852b142ad2 Raw diff: https://github.com/php/php-src/commit/1f4a88c5c382af95a534475fa7a74c852b142ad2.diff Merge branch 'PHP-8.5' * PHP-8.5: [skip ci] Revert "CI: Enable JIT testing on Apple Silicon ZTS 8.6+" Changed paths: M .github/matrix.php M .github/workflows/test-suite.yml Diff: diff --git a/.github/matrix.php b/.github/matrix.php index eefb27e5ba53..7970442d7050 100644 --- a/.github/matrix.php +++ b/.github/matrix.php @@ -127,19 +127,7 @@ function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $re $test_arm = version_compare($php_version, '8.4', '>='); $jobs['MACOS']['matrix'] = $all_variations ? ['arch' => $test_arm ? ['X64', 'ARM64'] : ['X64'], 'debug' => [true, false], 'zts' => [true, false]] - : ['include' => [['arch' => $test_arm ? 'ARM64' : 'X64', 'debug' => true, 'zts' => false, 'jit' => true]]]; - if ($all_variations) { - // Set the jit variable on X64 jobs - $jobs['MACOS']['matrix']['include'][] = ['arch' => 'X64', 'jit' => true]; - if ($test_arm) { - // Set the jit variable on ARM64 NTS jobs - $jobs['MACOS']['matrix']['include'][] = ['arch' => 'ARM64', 'zts' => false, 'jit' => true]; - // Set the jit variable on ARM64 ZTS jobs on 8.6+ - if (version_compare($php_version, '8.6', '>=')) { - $jobs['MACOS']['matrix']['include'][] = ['arch' => 'ARM64', 'zts' => true, 'jit' => true]; - } - } - } + : ['include' => [['arch' => $test_arm ? 'ARM64' : 'X64', 'debug' => true, 'zts' => false]]]; $jobs['MACOS']['config']['arm64_version'] = version_compare($php_version, '8.4', '>=') ? '15' : '14'; } if ($all_jobs || $test_msan) { diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index b51dfbd957c5..e269ed336408 100644 --- a/.github/workflows/test-suite.yml +++ b/.github/workflows/test-suite.yml @@ -345,18 +345,18 @@ jobs: if: ${{ inputs.all_variations }} uses: ./.github/actions/test-macos - name: Test Tracing JIT - if: ${{ matrix.jit }} + if: ${{ matrix.arch == 'X64' || !matrix.zts }} uses: ./.github/actions/test-macos with: enableOpcache: true jitType: tracing - name: Test OpCache - if: ${{ inputs.all_variations }} + if: ${{ inputs.all_variations || (matrix.arch == 'ARM64' && matrix.zts) }} uses: ./.github/actions/test-macos with: enableOpcache: true - name: Test Function JIT - if: ${{ inputs.all_variations && matrix.jit }} + if: ${{ inputs.all_variations && (matrix.arch == 'X64' || !matrix.zts) }} uses: ./.github/actions/test-macos with: enableOpcache: true

« previous php.cvs (#140184) next »