Skip to content

Commit 119d7a7

Browse files
justsmthjustsmth
committed
Replace macos-13 w/ macos-15-intel
1 parent 4817764 commit 119d7a7

File tree

7 files changed

+35
-35
lines changed

7 files changed

+35
-35
lines changed

‎.github/workflows/analysis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ jobs:
149149
strategy:
150150
fail-fast: false
151151
matrix:
152-
os: [ ubuntu-latest, macos-13, macos-14, macos-latest, windows-latest ]
152+
os: [ ubuntu-latest, macos-15-intel, macos-14, macos-latest, windows-latest ]
153153
steps:
154154
- uses: actions/checkout@v3
155155
with:
@@ -180,7 +180,7 @@ jobs:
180180
strategy:
181181
fail-fast: false
182182
matrix:
183-
os: [ ubuntu-latest, macos-13, macos-14, macos-latest, windows-latest ]
183+
os: [ ubuntu-latest, macos-15-intel, macos-14, macos-latest, windows-latest ]
184184
steps:
185185
- uses: actions/checkout@v3
186186
with:

‎.github/workflows/compilers.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ jobs:
281281
fail-fast: false
282282
matrix:
283283
rust: [ stable ]
284-
os: [ ubuntu-latest, ubuntu-24.04-arm, macos-13, macos-14, macos-latest, windows-latest, windows-11-arm ]
284+
os: [ ubuntu-latest, ubuntu-24.04-arm, macos-15-intel, macos-14, macos-latest, windows-latest, windows-11-arm ]
285285
c_std: [ "11", "99" ]
286286
cmake: [ '0', '1' ]
287287
exclude:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
strategy:
3232
fail-fast: true
3333
matrix:
34-
os: [ ubuntu-latest, macos-13, macos-14 ]
34+
os: [ ubuntu-latest, macos-15-intel, macos-latest ]
3535
steps:
3636
- uses: actions/checkout@v4
3737
with:
@@ -111,7 +111,7 @@ jobs:
111111
strategy:
112112
fail-fast: false
113113
matrix:
114-
os: [ ubuntu-latest, macos-13, macos-14 ]
114+
os: [ ubuntu-latest, macos-15-intel, macos-latest ]
115115
steps:
116116
- uses: actions/checkout@v4
117117
with:

‎.github/workflows/fips.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
fail-fast: false
3535
matrix:
3636
rust: [ stable ]
37-
os: [ ubuntu-latest, macos-13, macos-latest ]
37+
os: [ ubuntu-latest, macos-15-intel, macos-latest ]
3838
args:
3939
- --release --all-targets --features fips,unstable
4040
- --profile release-lto --all-targets --features fips,unstable
@@ -63,7 +63,7 @@ jobs:
6363
brew uninstall --force cmake
6464
brew install --force cmake
6565
cmake --version
66-
echo 'CMAKE=${{ (matrix.os == 'macos-13' && '/usr/local') || '/opt/homebrew' }}/bin/cmake' >> $GITHUB_ENV
66+
echo 'CMAKE=/opt/homebrew/bin/cmake' >> $GITHUB_ENV
6767
- name: Run cargo test
6868
working-directory: ./aws-lc-rs
6969
run: cargo test ${{ matrix.args }}

‎.github/workflows/integration.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
fail-fast: false
3232
matrix:
33-
os: [ ubuntu-latest, macos-13, macos-latest ]
33+
os: [ ubuntu-latest, macos-15-intel, macos-latest ]
3434
env:
3535
GIT_CLONE_PROTECTION_ACTIVE: false
3636
steps:
@@ -53,7 +53,7 @@ jobs:
5353
strategy:
5454
fail-fast: false
5555
matrix:
56-
os: [ ubuntu-latest, macos-13, macos-latest ]
56+
os: [ ubuntu-latest, macos-15-intel, macos-latest ]
5757
latest: [ 0, 1 ]
5858
steps:
5959
- uses: actions/checkout@v3
@@ -126,7 +126,7 @@ jobs:
126126
strategy:
127127
fail-fast: false
128128
matrix:
129-
os: [ ubuntu-latest, macos-13, macos-latest, windows-latest ]
129+
os: [ ubuntu-latest, macos-15-intel, macos-latest, windows-latest ]
130130
features: [ aws-lc-rs, aws-lc-rs-fips, aws-lc-sys, aws-lc-fips-sys ]
131131
steps:
132132
- uses: actions/checkout@v3
@@ -201,7 +201,7 @@ jobs:
201201
fail-fast: false
202202
matrix:
203203
rust: [ stable ]
204-
os: [ windows-latest, ubuntu-latest, macos-13, macos-latest ]
204+
os: [ windows-latest, ubuntu-latest, macos-15-intel, macos-latest ]
205205
crate: [ aws-lc-sys, aws-lc-fips-sys ]
206206
args:
207207
- publish --dry-run
@@ -245,7 +245,7 @@ jobs:
245245
fail-fast: false
246246
matrix:
247247
rust: [ stable ]
248-
os: [ windows-latest, ubuntu-latest, macos-13, macos-latest ]
248+
os: [ windows-latest, ubuntu-latest, macos-15-intel, macos-latest ]
249249
args:
250250
- publish --dry-run
251251
steps:
@@ -323,7 +323,7 @@ jobs:
323323
strategy:
324324
fail-fast: false
325325
matrix:
326-
os: [ ubuntu-latest, macos-13, macos-latest, windows-latest ]
326+
os: [ ubuntu-latest, macos-15-intel, macos-latest, windows-latest ]
327327
steps:
328328
- uses: actions/checkout@v3
329329
with:
@@ -333,8 +333,8 @@ jobs:
333333
- if: ${{ startsWith(matrix.os, 'macos-') }}
334334
run: |
335335
brew install llvm
336-
echo 'LIBCLANG_PATH=${{ (matrix.os == 'macos-13' && '/usr/local') || '/opt/homebrew' }}/opt/llvm/lib' >> $GITHUB_ENV
337-
echo 'LLVM_CONFIG_PATH=${{ (matrix.os == 'macos-13' && '/usr/local') || '/opt/homebrew' }}/opt/llvm/bin/llvm-config' >> $GITHUB_ENV
336+
echo 'LIBCLANG_PATH=/opt/homebrew/opt/llvm/lib' >> $GITHUB_ENV
337+
echo 'LLVM_CONFIG_PATH=/opt/homebrew/opt/llvm/bin/llvm-config' >> $GITHUB_ENV
338338
- name: Install NASM on Windows
339339
if: runner.os == 'Windows'
340340
uses: ilammy/setup-nasm@v1

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
strategy:
3232
fail-fast: true
3333
matrix:
34-
os: [ ubuntu-latest, macos-13, macos-14 ]
34+
os: [ ubuntu-latest, macos-15-intel, macos-latest ]
3535
steps:
3636
- uses: actions/checkout@v4
3737
with:
@@ -168,7 +168,7 @@ jobs:
168168
strategy:
169169
fail-fast: false
170170
matrix:
171-
os: [ ubuntu-latest, macos-13, macos-14 ]
171+
os: [ ubuntu-latest, macos-15-intel, macos-latest ]
172172
steps:
173173
- uses: actions/checkout@v4
174174
with:
@@ -289,7 +289,7 @@ jobs:
289289
strategy:
290290
fail-fast: false
291291
matrix:
292-
os: [ ubuntu-latest, macos-13, macos-14 ]
292+
os: [ ubuntu-latest, macos-15-intel, macos-latest ]
293293
steps:
294294
- uses: actions/checkout@v3
295295
with:

‎.github/workflows/tests.yml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
fail-fast: false
3333
matrix:
3434
rust: [ stable ]
35-
os: [ ubuntu-latest, macos-13, macos-latest, ubuntu-24.04-arm ]
35+
os: [ ubuntu-latest, macos-15-intel, macos-latest, ubuntu-24.04-arm ]
3636
args:
3737
- --all-targets --features unstable
3838
- --release --all-targets --features unstable
@@ -65,7 +65,7 @@ jobs:
6565
fail-fast: false
6666
matrix:
6767
rust: [ stable ]
68-
os: [ ubuntu-latest, macos-13, macos-latest ]
68+
os: [ ubuntu-latest, macos-15-intel, macos-latest ]
6969
args:
7070
- --no-default-features --features aws-lc-sys,bindgen,unstable
7171
- --release --all-targets --features bindgen,unstable
@@ -76,8 +76,8 @@ jobs:
7676
- if: ${{ startsWith(matrix.os, 'macos-') }}
7777
run: |
7878
brew install llvm
79-
echo 'LIBCLANG_PATH=${{ (matrix.os == 'macos-13' && '/usr/local') || '/opt/homebrew' }}/opt/llvm/lib' >> $GITHUB_ENV
80-
echo 'LLVM_CONFIG_PATH=${{ (matrix.os == 'macos-13' && '/usr/local') || '/opt/homebrew' }}/opt/llvm/bin/llvm-config' >> $GITHUB_ENV
79+
echo 'LIBCLANG_PATH=/opt/homebrew/opt/llvm/lib' >> $GITHUB_ENV
80+
echo 'LLVM_CONFIG_PATH=/usr/local/opt/llvm/bin/llvm-config' >> $GITHUB_ENV
8181
- uses: dtolnay/rust-toolchain@master
8282
id: toolchain
8383
with:
@@ -193,7 +193,7 @@ jobs:
193193
strategy:
194194
fail-fast: false
195195
matrix:
196-
os: [ ubuntu-latest, macos-13, macos-latest ]
196+
os: [ ubuntu-latest, macos-15-intel, macos-latest ]
197197
static: [ 0, 1 ]
198198
steps:
199199
- uses: actions/checkout@v4
@@ -283,7 +283,7 @@ jobs:
283283
strategy:
284284
fail-fast: false
285285
matrix:
286-
os: [ ubuntu-latest, macos-13, macos-latest ]
286+
os: [ ubuntu-latest, macos-15-intel, macos-latest ]
287287
steps:
288288
- uses: actions/checkout@v4
289289
with:
@@ -340,13 +340,13 @@ jobs:
340340
strategy:
341341
fail-fast: false
342342
matrix:
343-
os: [ ubuntu-latest, macos-13, macos-latest ]
343+
os: [ ubuntu-latest, macos-15-intel, macos-latest ]
344344
static: [ 0, 1 ]
345345
exclude:
346346
# The FIPS build on macOS can only produce shared libraries.
347347
- os: 'macos-latest'
348348
static: 1
349-
- os: 'macos-13'
349+
- os: 'macos-15-intel'
350350
static: 1
351351
steps:
352352
- uses: actions/checkout@v4
@@ -368,7 +368,7 @@ jobs:
368368
strategy:
369369
fail-fast: false
370370
matrix:
371-
os: [ ubuntu-latest, macos-13, macos-latest, windows-latest ]
371+
os: [ ubuntu-latest, macos-15-intel, macos-latest, windows-latest ]
372372
steps:
373373
- uses: actions/checkout@v4
374374
with:
@@ -403,7 +403,7 @@ jobs:
403403
strategy:
404404
fail-fast: false
405405
matrix:
406-
os: [ ubuntu-latest, macos-13, macos-latest, windows-latest ]
406+
os: [ ubuntu-latest, macos-15-intel, macos-latest, windows-latest ]
407407
steps:
408408
- uses: actions/checkout@v4
409409
with:
@@ -442,7 +442,7 @@ jobs:
442442
strategy:
443443
fail-fast: false
444444
matrix:
445-
os: [ ubuntu-latest, macos-13, macos-latest, windows-latest ]
445+
os: [ ubuntu-latest, macos-15-intel, macos-latest, windows-latest ]
446446
steps:
447447
- uses: actions/checkout@v4
448448
with:
@@ -473,7 +473,7 @@ jobs:
473473
matrix:
474474
os:
475475
- ubuntu-latest
476-
- macos-13
476+
- macos-15-intel
477477
- macos-latest
478478
steps:
479479
- uses: actions/checkout@v4
@@ -490,8 +490,8 @@ jobs:
490490
- if: ${{ startsWith(matrix.os, 'macos-') }}
491491
run: |
492492
brew install llvm
493-
echo 'LIBCLANG_PATH=${{ (matrix.os == 'macos-13' && '/usr/local') || '/opt/homebrew' }}/opt/llvm/lib' >> $GITHUB_ENV
494-
echo 'LLVM_CONFIG_PATH=${{ (matrix.os == 'macos-13' && '/usr/local') || '/opt/homebrew' }}/opt/llvm/bin/llvm-config' >> $GITHUB_ENV
493+
echo 'LIBCLANG_PATH=/opt/homebrew/opt/llvm/lib' >> $GITHUB_ENV
494+
echo 'LLVM_CONFIG_PATH=/opt/homebrew/opt/llvm/bin/llvm-config' >> $GITHUB_ENV
495495
- name: Set Rust toolchain override
496496
run: rustup override set ${{ steps.toolchain.outputs.name }}
497497
- uses: actions/setup-go@v4
@@ -542,7 +542,7 @@ jobs:
542542
strategy:
543543
fail-fast: false
544544
matrix:
545-
os: [ ubuntu-latest, macos-13, macos-latest, windows-latest ]
545+
os: [ ubuntu-latest, macos-15-intel, macos-latest, windows-latest ]
546546
fips: [ 0, 1 ]
547547
exclude:
548548
# macOS aarch64 fix for FIPS pending the following PR applied to FIPS branch:
@@ -576,7 +576,7 @@ jobs:
576576
strategy:
577577
fail-fast: false
578578
matrix:
579-
os: [ ubuntu-latest, macos-13, macos-latest ]
579+
os: [ ubuntu-latest, macos-15-intel, macos-latest ]
580580
pregen_src: [ 0, 1 ]
581581
steps:
582582
- uses: actions/checkout@v4
@@ -602,7 +602,7 @@ jobs:
602602
brew uninstall --force cmake
603603
brew install --force cmake
604604
cmake --version
605-
echo 'CMAKE=${{ (matrix.os == 'macos-13' && '/usr/local') || '/opt/homebrew' }}/bin/cmake' >> $GITHUB_ENV
605+
echo 'CMAKE=/opt/homebrew/bin/cmake' >> $GITHUB_ENV
606606
- name: Run cargo test
607607
working-directory: "path has spaces/aws-lc-rs"
608608
run: cargo test --tests -p aws-lc-rs --features bindgen

0 commit comments

Comments
 (0)