Skip to content

Commit 040af67

Browse files
wraithgarwraithgar
authored
feat: move node14 tests to macos-15-intel (#551)
See #440 for more info on node versions and M1 macos
1 parent ed24fbf commit 040af67

File tree

5 files changed

+37
-36
lines changed

5 files changed

+37
-36
lines changed

‎.github/workflows/ci-release.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
os: macos-latest
8686
shell: bash
8787
- name: macOS
88-
os: macos-13
88+
os: macos-15-intel
8989
shell: bash
9090
- name: Windows
9191
os: windows-latest
@@ -96,13 +96,13 @@ jobs:
9696
- 22.9.0
9797
- 22.x
9898
exclude:
99-
- platform: { name: macOS, os: macos-13, shell: bash }
99+
- platform: { name: macOS, os: macos-15-intel, shell: bash }
100100
node-version: 20.17.0
101-
- platform: { name: macOS, os: macos-13, shell: bash }
101+
- platform: { name: macOS, os: macos-15-intel, shell: bash }
102102
node-version: 20.x
103-
- platform: { name: macOS, os: macos-13, shell: bash }
103+
- platform: { name: macOS, os: macos-15-intel, shell: bash }
104104
node-version: 22.9.0
105-
- platform: { name: macOS, os: macos-13, shell: bash }
105+
- platform: { name: macOS, os: macos-15-intel, shell: bash }
106106
node-version: 22.x
107107
runs-on: ${{ matrix.platform.os }}
108108
defaults:

‎.github/workflows/ci-test-workspace.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
os: macos-latest
6666
shell: bash
6767
- name: macOS
68-
os: macos-13
68+
os: macos-15-intel
6969
shell: bash
7070
- name: Windows
7171
os: windows-latest
@@ -77,15 +77,15 @@ jobs:
7777
- 20.x
7878
- 22.x
7979
exclude:
80-
- platform: { name: macOS, os: macos-13, shell: bash }
80+
- platform: { name: macOS, os: macos-15-intel, shell: bash }
8181
node-version: 18.17.0
82-
- platform: { name: macOS, os: macos-13, shell: bash }
82+
- platform: { name: macOS, os: macos-15-intel, shell: bash }
8383
node-version: 18.x
84-
- platform: { name: macOS, os: macos-13, shell: bash }
84+
- platform: { name: macOS, os: macos-15-intel, shell: bash }
8585
node-version: 20.5.0
86-
- platform: { name: macOS, os: macos-13, shell: bash }
86+
- platform: { name: macOS, os: macos-15-intel, shell: bash }
8787
node-version: 20.x
88-
- platform: { name: macOS, os: macos-13, shell: bash }
88+
- platform: { name: macOS, os: macos-15-intel, shell: bash }
8989
node-version: 22.x
9090
runs-on: ${{ matrix.platform.os }}
9191
defaults:

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
os: macos-latest
6666
shell: bash
6767
- name: macOS
68-
os: macos-13
68+
os: macos-15-intel
6969
shell: bash
7070
- name: Windows
7171
os: windows-latest
@@ -76,13 +76,13 @@ jobs:
7676
- 22.9.0
7777
- 22.x
7878
exclude:
79-
- platform: { name: macOS, os: macos-13, shell: bash }
79+
- platform: { name: macOS, os: macos-15-intel, shell: bash }
8080
node-version: 20.17.0
81-
- platform: { name: macOS, os: macos-13, shell: bash }
81+
- platform: { name: macOS, os: macos-15-intel, shell: bash }
8282
node-version: 20.x
83-
- platform: { name: macOS, os: macos-13, shell: bash }
83+
- platform: { name: macOS, os: macos-15-intel, shell: bash }
8484
node-version: 22.9.0
85-
- platform: { name: macOS, os: macos-13, shell: bash }
85+
- platform: { name: macOS, os: macos-15-intel, shell: bash }
8686
node-version: 22.x
8787
runs-on: ${{ matrix.platform.os }}
8888
defaults:

‎lib/content/_job-matrix-yml.hbs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ strategy:
1212
os: macos-latest
1313
shell: bash
1414
- name: macOS
15-
os: macos-13
15+
os: macos-15-intel
1616
shell: bash
1717
{{/if}}
1818
{{#if windowsCI}}
@@ -27,7 +27,8 @@ strategy:
2727
{{#if macCI}}
2828
exclude:
2929
{{#each ciVersions}}
30-
- platform: {name: macOS, os: macos-{{#if (lte (semverRangeMajor .) 14)}}latest{{else}}13{{/if}}, shell: bash}
30+
{{!-- M1 macs do not have builds of node 14 and below --}}
31+
- platform: {name: macOS, os: {{#if (lte (semverRangeMajor .) 14)}}macos-latest{{else}}macos-15-intel{{/if}}, shell: bash}
3132
node-version: {{ . }}
3233
{{/each}}
3334
{{/if}}

‎tap-snapshots/test/apply/source-snapshots.js.test.cjs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -480,15 +480,15 @@ jobs:
480480
os: macos-latest
481481
shell: bash
482482
- name: macOS
483-
os: macos-13
483+
os: macos-15-intel
484484
shell: bash
485485
- name: Windows
486486
os: windows-latest
487487
shell: cmd
488488
node-version:
489489
- 22.x
490490
exclude:
491-
- platform: { name: macOS, os: macos-13, shell: bash }
491+
- platform: { name: macOS, os: macos-15-intel, shell: bash }
492492
node-version: 22.x
493493
runs-on: \${{ matrix.platform.os }}
494494
defaults:
@@ -602,15 +602,15 @@ jobs:
602602
os: macos-latest
603603
shell: bash
604604
- name: macOS
605-
os: macos-13
605+
os: macos-15-intel
606606
shell: bash
607607
- name: Windows
608608
os: windows-latest
609609
shell: cmd
610610
node-version:
611611
- 22.x
612612
exclude:
613-
- platform: { name: macOS, os: macos-13, shell: bash }
613+
- platform: { name: macOS, os: macos-15-intel, shell: bash }
614614
node-version: 22.x
615615
runs-on: \${{ matrix.platform.os }}
616616
defaults:
@@ -1923,15 +1923,15 @@ jobs:
19231923
os: macos-latest
19241924
shell: bash
19251925
- name: macOS
1926-
os: macos-13
1926+
os: macos-15-intel
19271927
shell: bash
19281928
- name: Windows
19291929
os: windows-latest
19301930
shell: cmd
19311931
node-version:
19321932
- 22.x
19331933
exclude:
1934-
- platform: { name: macOS, os: macos-13, shell: bash }
1934+
- platform: { name: macOS, os: macos-15-intel, shell: bash }
19351935
node-version: 22.x
19361936
runs-on: \${{ matrix.platform.os }}
19371937
defaults:
@@ -2032,15 +2032,15 @@ jobs:
20322032
os: macos-latest
20332033
shell: bash
20342034
- name: macOS
2035-
os: macos-13
2035+
os: macos-15-intel
20362036
shell: bash
20372037
- name: Windows
20382038
os: windows-latest
20392039
shell: cmd
20402040
node-version:
20412041
- 22.x
20422042
exclude:
2043-
- platform: { name: macOS, os: macos-13, shell: bash }
2043+
- platform: { name: macOS, os: macos-15-intel, shell: bash }
20442044
node-version: 22.x
20452045
runs-on: \${{ matrix.platform.os }}
20462046
defaults:
@@ -2159,15 +2159,15 @@ jobs:
21592159
os: macos-latest
21602160
shell: bash
21612161
- name: macOS
2162-
os: macos-13
2162+
os: macos-15-intel
21632163
shell: bash
21642164
- name: Windows
21652165
os: windows-latest
21662166
shell: cmd
21672167
node-version:
21682168
- 22.x
21692169
exclude:
2170-
- platform: { name: macOS, os: macos-13, shell: bash }
2170+
- platform: { name: macOS, os: macos-15-intel, shell: bash }
21712171
node-version: 22.x
21722172
runs-on: \${{ matrix.platform.os }}
21732173
defaults:
@@ -2287,15 +2287,15 @@ jobs:
22872287
os: macos-latest
22882288
shell: bash
22892289
- name: macOS
2290-
os: macos-13
2290+
os: macos-15-intel
22912291
shell: bash
22922292
- name: Windows
22932293
os: windows-latest
22942294
shell: cmd
22952295
node-version:
22962296
- 22.x
22972297
exclude:
2298-
- platform: { name: macOS, os: macos-13, shell: bash }
2298+
- platform: { name: macOS, os: macos-15-intel, shell: bash }
22992299
node-version: 22.x
23002300
runs-on: \${{ matrix.platform.os }}
23012301
defaults:
@@ -3623,15 +3623,15 @@ jobs:
36233623
os: macos-latest
36243624
shell: bash
36253625
- name: macOS
3626-
os: macos-13
3626+
os: macos-15-intel
36273627
shell: bash
36283628
- name: Windows
36293629
os: windows-latest
36303630
shell: cmd
36313631
node-version:
36323632
- 22.x
36333633
exclude:
3634-
- platform: { name: macOS, os: macos-13, shell: bash }
3634+
- platform: { name: macOS, os: macos-15-intel, shell: bash }
36353635
node-version: 22.x
36363636
runs-on: \${{ matrix.platform.os }}
36373637
defaults:
@@ -3732,15 +3732,15 @@ jobs:
37323732
os: macos-latest
37333733
shell: bash
37343734
- name: macOS
3735-
os: macos-13
3735+
os: macos-15-intel
37363736
shell: bash
37373737
- name: Windows
37383738
os: windows-latest
37393739
shell: cmd
37403740
node-version:
37413741
- 22.x
37423742
exclude:
3743-
- platform: { name: macOS, os: macos-13, shell: bash }
3743+
- platform: { name: macOS, os: macos-15-intel, shell: bash }
37443744
node-version: 22.x
37453745
runs-on: \${{ matrix.platform.os }}
37463746
defaults:
@@ -3859,15 +3859,15 @@ jobs:
38593859
os: macos-latest
38603860
shell: bash
38613861
- name: macOS
3862-
os: macos-13
3862+
os: macos-15-intel
38633863
shell: bash
38643864
- name: Windows
38653865
os: windows-latest
38663866
shell: cmd
38673867
node-version:
38683868
- 22.x
38693869
exclude:
3870-
- platform: { name: macOS, os: macos-13, shell: bash }
3870+
- platform: { name: macOS, os: macos-15-intel, shell: bash }
38713871
node-version: 22.x
38723872
runs-on: \${{ matrix.platform.os }}
38733873
defaults:

0 commit comments

Comments
 (0)