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

Author: Shivam Mathur (shivammathur) Date: 2026-10-02T14:16:53+05:30 Commit: https://github.com/php/php-src/commit/4abf11d2e0eaa995841e6503674cb2c34aa6ad0c Raw diff: https://github.com/php/php-src/commit/4abf11d2e0eaa995841e6503674cb2c34aa6ad0c.diff Merge branch 'PHP-8.5' into PHP-8.6 * PHP-8.5: Upgrade macos in CI. (#24032) Changed paths: M .github/matrix.php M .github/workflows/test-suite.yml Diff: diff --git a/.github/matrix.php b/.github/matrix.php index 87486791cff5..58edba024c96 100644 --- a/.github/matrix.php +++ b/.github/matrix.php @@ -129,7 +129,7 @@ function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $re $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]]]; - $jobs['MACOS']['config']['arm64_version'] = version_compare($php_version, '8.4', '>=') ? '15' : '14'; + $jobs['MACOS']['config']['version'] = version_compare($php_version, '8.4', '>=') ? '26' : '15'; } if ($all_jobs || $test_msan) { $jobs['MSAN'] = true; diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index c9f61e6adfd5..89a5cdb04566 100644 --- a/.github/workflows/test-suite.yml +++ b/.github/workflows/test-suite.yml @@ -312,7 +312,7 @@ jobs: fail-fast: false matrix: ${{ fromJson(inputs.branch).jobs.MACOS.matrix }} name: "MACOS_${{ matrix.arch }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}" - runs-on: macos-${{ matrix.arch == 'X64' && '15-intel' || fromJson(inputs.branch).jobs.MACOS.config.arm64_version }} + runs-on: macos-${{ fromJson(inputs.branch).jobs.MACOS.config.version }}${{ matrix.arch == 'X64' && '-intel' || '' }} timeout-minutes: 180 steps: - name: git checkout