Skip to content

Commit b70198e

Browse files
committed
ci: update to 15 in nightly and remove other macos
1 parent fe78b62 commit b70198e

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

.github/workflows/nightly.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -357,10 +357,8 @@ jobs:
357357
matrix:
358358
debug: [true, false]
359359
zts: [true, false]
360-
os: ['13', '14']
361-
exclude:
362-
- os: ${{ !inputs.run_macos_arm64 && '14' || '*never*' }}
363-
name: "MACOS_${{ matrix.os == '13' && 'X64' || 'ARM64' }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
360+
os: [ '15']
361+
name: "MACOS_ARM64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
364362
runs-on: macos-${{ matrix.os }}
365363
steps:
366364
- name: git checkout
@@ -384,7 +382,6 @@ jobs:
384382
- name: Test
385383
uses: ./.github/actions/test-macos
386384
- name: Test Tracing JIT
387-
if: matrix.os != '14' || !matrix.zts
388385
uses: ./.github/actions/test-macos
389386
with:
390387
jitType: tracing
@@ -398,7 +395,6 @@ jobs:
398395
-d zend_extension=opcache.so
399396
-d opcache.enable_cli=1
400397
- name: Test Function JIT
401-
if: matrix.os != '14' || !matrix.zts
402398
uses: ./.github/actions/test-macos
403399
with:
404400
jitType: function

.github/workflows/push.yml

-2
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,6 @@ jobs:
198198
fail-fast: false
199199
matrix:
200200
include:
201-
- os: 14
202-
arch: ARM64
203201
- os: 15
204202
arch: ARM64
205203
name: MACOS_${{ matrix.arch }}_DEBUG_NTS

0 commit comments

Comments
 (0)