Skip to content

Commit 028bcd9

Browse files
justsmthjustsmth
authored
Update MacOS GH runners (#798)
1 parent 3cffdbb commit 028bcd9

File tree

8 files changed

+29
-29
lines changed

8 files changed

+29
-29
lines changed

‎.github/workflows/analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ jobs:
145145
strategy:
146146
fail-fast: false
147147
matrix:
148-
os: [ ubuntu-latest, macos-13, macos-14-xlarge, windows-latest ]
148+
os: [ ubuntu-latest, macos-13, macos-14, macos-latest, windows-latest ]
149149
steps:
150150
- uses: actions/checkout@v3
151151
with:
@@ -176,7 +176,7 @@ jobs:
176176
strategy:
177177
fail-fast: false
178178
matrix:
179-
os: [ ubuntu-latest, macos-13, macos-14-xlarge, windows-latest ]
179+
os: [ ubuntu-latest, macos-13, macos-14, macos-latest, windows-latest ]
180180
steps:
181181
- uses: actions/checkout@v3
182182
with:

‎.github/workflows/compilers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ jobs:
156156
fail-fast: false
157157
matrix:
158158
rust: [ stable ]
159-
os: [ ubuntu-latest, macos-13, macos-14-xlarge, windows-latest ]
159+
os: [ ubuntu-latest, macos-13, macos-14, macos-latest, windows-latest ]
160160
c_std: [ "11", "99" ]
161161
cmake: [ '0', '1' ]
162162
steps:

‎.github/workflows/cross.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129
aws-lc-rs-ios-aarch64:
130130
if: github.repository_owner == 'aws'
131131
name: iOS aarch64 cross-platform build
132-
runs-on: macos-14-xlarge
132+
runs-on: macos-latest
133133
steps:
134134
- uses: actions/checkout@v3
135135
with:
@@ -149,7 +149,7 @@ jobs:
149149
aws-lc-rs-ios-x86_64:
150150
if: github.repository_owner == 'aws'
151151
name: iOS x86-64 cross-platform build
152-
runs-on: macos-14-xlarge
152+
runs-on: macos-latest
153153
steps:
154154
- uses: actions/checkout@v3
155155
with:

‎.github/workflows/fips-bindings-generator.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
strategy:
2828
fail-fast: true
2929
matrix:
30-
os: [ ubuntu-latest, macos-13, macos-14-xlarge ]
30+
os: [ ubuntu-latest, macos-13, macos-14 ]
3131
steps:
3232
- uses: actions/checkout@v4
3333
with:
@@ -107,7 +107,7 @@ jobs:
107107
strategy:
108108
fail-fast: false
109109
matrix:
110-
os: [ ubuntu-latest, macos-13, macos-14-xlarge ]
110+
os: [ ubuntu-latest, macos-13, macos-14 ]
111111
steps:
112112
- uses: actions/checkout@v4
113113
with:

‎.github/workflows/fips.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
fail-fast: false
3131
matrix:
3232
rust: [ stable ]
33-
os: [ ubuntu-latest, macos-13, macos-14-xlarge ]
33+
os: [ ubuntu-latest, macos-13, macos-latest ]
3434
args:
3535
- --release --all-targets --features fips,unstable
3636
- --profile release-lto --all-targets --features fips,unstable

‎.github/workflows/integration.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
strategy:
2727
fail-fast: false
2828
matrix:
29-
os: [ ubuntu-latest, macos-13, macos-14-xlarge ]
29+
os: [ ubuntu-latest, macos-13, macos-latest ]
3030
env:
3131
GIT_CLONE_PROTECTION_ACTIVE: false
3232
steps:
@@ -49,7 +49,7 @@ jobs:
4949
strategy:
5050
fail-fast: false
5151
matrix:
52-
os: [ ubuntu-latest, macos-13, macos-14-xlarge ]
52+
os: [ ubuntu-latest, macos-13, macos-latest ]
5353
latest: [ 0, 1 ]
5454
steps:
5555
- uses: actions/checkout@v3
@@ -124,7 +124,7 @@ jobs:
124124
strategy:
125125
fail-fast: false
126126
matrix:
127-
os: [ ubuntu-latest, macos-13, macos-14-xlarge, windows-latest ]
127+
os: [ ubuntu-latest, macos-13, macos-latest, windows-latest ]
128128
features: [ aws-lc-rs, aws-lc-rs-fips, aws-lc-sys, aws-lc-fips-sys ]
129129
steps:
130130
- uses: actions/checkout@v3
@@ -158,7 +158,7 @@ jobs:
158158
fail-fast: false
159159
matrix:
160160
rust: [ stable ]
161-
os: [ windows-latest, ubuntu-latest, macos-13, macos-14-xlarge ]
161+
os: [ windows-latest, ubuntu-latest, macos-13, macos-latest ]
162162
crate: [ aws-lc-sys, aws-lc-rs, aws-lc-fips-sys ]
163163
args:
164164
- publish --dry-run
@@ -232,7 +232,7 @@ jobs:
232232
strategy:
233233
fail-fast: false
234234
matrix:
235-
os: [ ubuntu-latest, macos-13, macos-14-xlarge, windows-latest ]
235+
os: [ ubuntu-latest, macos-13, macos-latest, windows-latest ]
236236
steps:
237237
- uses: actions/checkout@v3
238238
with:

‎.github/workflows/sys-bindings-generator.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
strategy:
2828
fail-fast: true
2929
matrix:
30-
os: [ ubuntu-latest, macos-13, macos-14-xlarge ]
30+
os: [ ubuntu-latest, macos-13, macos-14 ]
3131
steps:
3232
- uses: actions/checkout@v4
3333
with:
@@ -156,7 +156,7 @@ jobs:
156156
strategy:
157157
fail-fast: false
158158
matrix:
159-
os: [ ubuntu-latest, macos-13, macos-14-xlarge ]
159+
os: [ ubuntu-latest, macos-13, macos-14 ]
160160
steps:
161161
- uses: actions/checkout@v4
162162
with:
@@ -244,7 +244,7 @@ jobs:
244244
strategy:
245245
fail-fast: false
246246
matrix:
247-
os: [ ubuntu-latest, macos-13, macos-14-xlarge ]
247+
os: [ ubuntu-latest, macos-13, macos-14 ]
248248
steps:
249249
- uses: actions/checkout@v3
250250
with:

‎.github/workflows/tests.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
fail-fast: false
2929
matrix:
3030
rust: [ stable ]
31-
os: [ ubuntu-latest, macos-13, macos-14-xlarge ]
31+
os: [ ubuntu-latest, macos-13, macos-latest ]
3232
args:
3333
- --all-targets --features unstable
3434
- --release --all-targets --features unstable
@@ -61,7 +61,7 @@ jobs:
6161
fail-fast: false
6262
matrix:
6363
rust: [ stable ]
64-
os: [ ubuntu-latest, macos-13, macos-14-xlarge ]
64+
os: [ ubuntu-latest, macos-13, macos-latest ]
6565
args:
6666
- --no-default-features --features aws-lc-sys,bindgen,unstable
6767
- --release --all-targets --features bindgen,unstable
@@ -189,7 +189,7 @@ jobs:
189189
strategy:
190190
fail-fast: false
191191
matrix:
192-
os: [ ubuntu-latest, macos-13, macos-14-xlarge ]
192+
os: [ ubuntu-latest, macos-13, macos-latest ]
193193
static: [ 0, 1 ]
194194
steps:
195195
- uses: actions/checkout@v4
@@ -274,7 +274,7 @@ jobs:
274274
strategy:
275275
fail-fast: false
276276
matrix:
277-
os: [ ubuntu-latest, macos-13, macos-14-xlarge ]
277+
os: [ ubuntu-latest, macos-13, macos-latest ]
278278
steps:
279279
- uses: actions/checkout@v4
280280
with:
@@ -331,7 +331,7 @@ jobs:
331331
strategy:
332332
fail-fast: false
333333
matrix:
334-
os: [ ubuntu-latest, macos-13, macos-14-xlarge ]
334+
os: [ ubuntu-latest, macos-13, macos-latest ]
335335
static: [ 0, 1 ]
336336
steps:
337337
- uses: actions/checkout@v4
@@ -354,7 +354,7 @@ jobs:
354354
strategy:
355355
fail-fast: false
356356
matrix:
357-
os: [ ubuntu-latest, macos-13, macos-14-xlarge, windows-latest ]
357+
os: [ ubuntu-latest, macos-13, macos-latest, windows-latest ]
358358
steps:
359359
- uses: actions/checkout@v4
360360
with:
@@ -389,7 +389,7 @@ jobs:
389389
strategy:
390390
fail-fast: false
391391
matrix:
392-
os: [ ubuntu-latest, macos-13, macos-14-xlarge, windows-latest ]
392+
os: [ ubuntu-latest, macos-13, macos-latest, windows-latest ]
393393
steps:
394394
- uses: actions/checkout@v4
395395
with:
@@ -428,7 +428,7 @@ jobs:
428428
strategy:
429429
fail-fast: false
430430
matrix:
431-
os: [ ubuntu-latest, macos-13, macos-14-xlarge, windows-latest ]
431+
os: [ ubuntu-latest, macos-13, macos-latest, windows-latest ]
432432
steps:
433433
- uses: actions/checkout@v4
434434
with:
@@ -460,7 +460,7 @@ jobs:
460460
os:
461461
- ubuntu-latest
462462
- macos-13
463-
- macos-14-xlarge
463+
- macos-latest
464464
steps:
465465
- uses: actions/checkout@v4
466466
with:
@@ -494,7 +494,7 @@ jobs:
494494
clang-19-bindgen:
495495
if: github.repository_owner == 'aws'
496496
name: Clang 19.1 + bindgen tests
497-
runs-on: macos-14-xlarge
497+
runs-on: macos-latest
498498
env:
499499
LIBCLANG_PATH: '/opt/homebrew/opt/llvm@19/lib'
500500
LLVM_CONFIG_PATH: '/opt/homebrew/opt/llvm@19/bin/llvm-config'
@@ -528,7 +528,7 @@ jobs:
528528
strategy:
529529
fail-fast: false
530530
matrix:
531-
os: [ ubuntu-latest, macos-13, macos-14-xlarge, windows-latest ]
531+
os: [ ubuntu-latest, macos-13, macos-latest, windows-latest ]
532532
fips: [ 0, 1 ]
533533
steps:
534534
- uses: actions/checkout@v4
@@ -545,7 +545,7 @@ jobs:
545545
- name: Run cargo test
546546
# macOS aarch64 fix for FIPS pending the following PR applied to FIPS branch:
547547
# https://github.com/aws/aws-lc/pull/2005
548-
if: ${{ matrix.fips == 0 || matrix.os != 'macos-14-xlarge' }}
548+
if: ${{ matrix.fips == 0 || matrix.os != 'macos-latest' }}
549549
working-directory: "path has spaces/aws-lc-rs"
550550
run: cargo test --tests -p aws-lc-rs --no-default-features --features ${{ (matrix.fips == 1 && 'fips') || 'aws-lc-sys' }}
551551

@@ -560,7 +560,7 @@ jobs:
560560
strategy:
561561
fail-fast: false
562562
matrix:
563-
os: [ ubuntu-latest, macos-13, macos-14-xlarge ]
563+
os: [ ubuntu-latest, macos-13, macos-latest ]
564564
pregen_src: [ 0, 1 ]
565565
steps:
566566
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)