Skip to content

Commit ec9b68c

Browse files
committed
[skip ci] Skip JIT tests for Apple Silicon + ZTS
JIT will be disabled for Apple Silicon + ZTS anyway. See: 6db9551
1 parent 9f1b43f commit ec9b68c

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

.github/nightly_matrix.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,9 @@ function get_macos_matrix_include(array $branches) {
100100
'branch' => $branch,
101101
'debug' => $debug,
102102
'zts' => $zts,
103-
'os' => $branch === 'master' ? '13' : '12',
103+
'os' => $branch['name'] === 'master' ? '13' : '12',
104104
'arch' => 'X64',
105+
'test_jit' => true,
105106
];
106107
if ($branch['version']['minor'] >= 4 || $branch['version']['major'] >= 9) {
107108
$jobs[] = [
@@ -110,6 +111,7 @@ function get_macos_matrix_include(array $branches) {
110111
'zts' => $zts,
111112
'os' => '14',
112113
'arch' => 'ARM64',
114+
'test_jit' => !$zts,
113115
];
114116
}
115117
}

.github/workflows/nightly.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ jobs:
256256
with:
257257
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.arch }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
258258
- name: Test Tracing JIT
259+
if: matrix.test_jit
259260
uses: ./.github/actions/test-macos
260261
with:
261262
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.arch }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
@@ -271,6 +272,7 @@ jobs:
271272
-d zend_extension=opcache.so
272273
-d opcache.enable_cli=1
273274
- name: Test Function JIT
275+
if: matrix.test_jit
274276
uses: ./.github/actions/test-macos
275277
with:
276278
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.arch }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Function JIT

0 commit comments

Comments
 (0)