Skip to content

Commit 6f7a83f

Browse files
committed
Attempted fix
1 parent 14e4920 commit 6f7a83f

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.github/workflows/nightly.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -371,11 +371,11 @@ jobs:
371371
matrix:
372372
debug: [true, false]
373373
zts: [true, false]
374-
os: ['13', inputs.macos_arm64_version]
374+
arch: ['X64', 'ARM64']
375375
exclude:
376-
- os: ${{ !inputs.run_macos_arm64 && inputs.macos_arm64_version || '*never*' }}
377-
name: "MACOS_${{ matrix.os == '13' && 'X64' || 'ARM64' }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
378-
runs-on: macos-${{ matrix.os }}
376+
- arch: ${{ !inputs.run_macos_arm64 && 'ARM64' || '*never*' }}
377+
name: "MACOS_${{ matrix.arch }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
378+
runs-on: macos-${{ matrix.arch == 'X64' && '13' || inputs.macos_arm64_version }}
379379
steps:
380380
- name: git checkout
381381
uses: actions/checkout@v4
@@ -398,7 +398,7 @@ jobs:
398398
- name: Test
399399
uses: ./.github/actions/test-macos
400400
- name: Test Tracing JIT
401-
if: matrix.os != inputs.macos_arm64_version || !matrix.zts
401+
if: matrix.arch == 'X64' || !matrix.zts
402402
uses: ./.github/actions/test-macos
403403
with:
404404
jitType: tracing
@@ -412,7 +412,7 @@ jobs:
412412
-d zend_extension=opcache.so
413413
-d opcache.enable_cli=1
414414
- name: Test Function JIT
415-
if: matrix.os != inputs.macos_arm64_version || !matrix.zts
415+
if: matrix.arch == 'X64' || !matrix.zts
416416
uses: ./.github/actions/test-macos
417417
with:
418418
jitType: function

0 commit comments

Comments
 (0)