Skip to content

Commit c4c5228

Browse files
committed
ci: removed macos13 from night job
1 parent 2650248 commit c4c5228

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

.github/workflows/nightly.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ on:
2020
run_linux_ppc64:
2121
required: true
2222
type: boolean
23-
run_macos_arm64:
24-
required: true
25-
type: boolean
2623
run_freebsd_zts:
2724
required: true
2825
type: boolean
@@ -374,10 +371,8 @@ jobs:
374371
matrix:
375372
debug: [true, false]
376373
zts: [true, false]
377-
os: ['13', '14']
378-
exclude:
379-
- os: ${{ !inputs.run_macos_arm64 && '14' || '*never*' }}
380-
name: "MACOS_${{ matrix.os == '13' && 'X64' || 'ARM64' }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
374+
os: ['14', '15']
375+
name: "MACOS_ARM64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
381376
runs-on: macos-${{ matrix.os }}
382377
steps:
383378
- name: git checkout
@@ -401,7 +396,7 @@ jobs:
401396
- name: Test
402397
uses: ./.github/actions/test-macos
403398
- name: Test Tracing JIT
404-
if: matrix.os != '14' || !matrix.zts
399+
if: ${{ !matrix.zts }}
405400
uses: ./.github/actions/test-macos
406401
with:
407402
jitType: tracing
@@ -415,7 +410,7 @@ jobs:
415410
-d zend_extension=opcache.so
416411
-d opcache.enable_cli=1
417412
- name: Test Function JIT
418-
if: matrix.os != '14' || !matrix.zts
413+
if: ${{ !matrix.zts }}
419414
uses: ./.github/actions/test-macos
420415
with:
421416
jitType: function

.github/workflows/root.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ jobs:
5454
libmysqlclient_with_mysqli: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1) }}
5555
run_alpine: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
5656
run_linux_ppc64: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
57-
run_macos_arm64: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
5857
run_freebsd_zts: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 3) || matrix.branch.version[0] >= 9 }}
5958
ubuntu_version: ${{
6059
(((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 5) || matrix.branch.version[0] >= 9) && '24.04')

0 commit comments

Comments
 (0)