Commit 8155a011899 for php
commit 8155a01189961a6d05621100b14a20608c191035
Author: Shivam Mathur <shivam_jpr@hotmail.com>
Date: Fri Oct 2 08:46:05 2026 +0000
Upgrade macos in CI. (#24032)
macOS 15 for PHP 8.2 and PHP 8.3
macOS 26 for PHP 8.4 and above.
diff --git a/.github/matrix.php b/.github/matrix.php
index 87486791cff..58edba024c9 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 c9f61e6adfd..89a5cdb0456 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