Skip to content

[pull] master from php:master #1095

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 5 commits into from
Jul 16, 2026
+16 −4
Merged

[pull] master from php:master #1095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fa47ae1
CI: Enable JIT testing on Apple Silicon ZTS 8.6+
arnaud-lb Jul 15, 2026
0d24b90
Merge branch 'PHP-8.2' into PHP-8.3
arnaud-lb Jul 16, 2026
5fd38ba
Merge branch 'PHP-8.3' into PHP-8.4
arnaud-lb Jul 16, 2026
6c89faa
Merge branch 'PHP-8.4' into PHP-8.5
arnaud-lb Jul 16, 2026
9c7bb94
Merge branch 'PHP-8.5'
arnaud-lb Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion .github/matrix.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,19 @@ 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]]];
: ['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];
}
}
}
$jobs['MACOS']['config']['arm64_version'] = version_compare($php_version, '8.4', '>=') ? '15' : '14';
}
if ($all_jobs || $test_msan) {
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-suite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,18 +345,18 @@ jobs:
if: ${{ inputs.all_variations }}
uses: ./.github/actions/test-macos
- name: Test Tracing JIT
if: ${{ matrix.arch == 'X64' || !matrix.zts }}
if: ${{ matrix.jit }}
uses: ./.github/actions/test-macos
with:
enableOpcache: true
jitType: tracing
- name: Test OpCache
if: ${{ inputs.all_variations || (matrix.arch == 'ARM64' && matrix.zts) }}
if: ${{ inputs.all_variations }}
uses: ./.github/actions/test-macos
with:
enableOpcache: true
- name: Test Function JIT
if: ${{ inputs.all_variations && (matrix.arch == 'X64' || !matrix.zts) }}
if: ${{ inputs.all_variations && matrix.jit }}
uses: ./.github/actions/test-macos
with:
enableOpcache: true
Expand Down