mirrors/php-src
0
0 Fork 0
mirror of https://github.com/php/php-src.git synced 2026-10-28 17:56:50 +08:00
Code Activity

Merge branch 'PHP-8.3' into PHP-8.4

Browse Source 
* PHP-8.3:
  [skip ci] Revert "CI: Enable JIT testing on Apple Silicon ZTS 8.6+"
This commit is contained in:
Ilija Tovilo committed 2026-07-23 21:17:33 +02:00
2 parents cc92d504a4 de7b4a6abd
commit b53aadea9c
2 files changed
+4 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.github/matrix.php
+1 -13
View File
@@ -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) {
.github/workflows/test-suite.yml
+3 -3
View File
@@ -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