[php-src] PHP-8.2: Upgrade macos in CI. (#24032)
| From: | Shivam Mathur via GitHub | Date: | Fri, 02 Oct 2026 08:46:08 +0000 |
| Subject: | [php-src] PHP-8.2: Upgrade macos in CI. (#24032) | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-141865@lists.php.net to get a copy of this message | ||
Author: Shivam Mathur (shivammathur)
Committer: GitHub (web-flow)
Pusher: shivammathur
Date: 2026-10-02T14:16:05+05:30
Commit: https://github.com/php/php-src/commit/8155a01189961a6d05621100b14a20608c191035
Raw diff: https://github.com/php/php-src/commit/8155a01189961a6d05621100b14a20608c191035.diff
Upgrade macos in CI. (#24032)
macOS 15 for PHP 8.2 and PHP 8.3
macOS 26 for PHP 8.4 and above.
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