Skip to content

Commit 1413b88

Browse files
ajewellamzajewellamz
authored
chore: bump CI to macos-14 (#1734)
1 parent f41b3c4 commit 1413b88

File tree

12 files changed

+93
-53
lines changed

12 files changed

+93
-53
lines changed

‎.github/actions/install_smithy_dafny_codegen_dependencies/action.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ runs:
99
using: "composite"
1010
steps:
1111
- name: Setup Java 17 for codegen
12-
uses: actions/setup-java@v3
12+
uses: actions/setup-java@v5
1313
with:
1414
distribution: "corretto"
1515
java-version: "17"
@@ -20,7 +20,7 @@ runs:
2020
make -C smithy-dafny mvn_local_deploy_polymorph_dependencies
2121
2222
- name: Setup Python, black, and docformatter for code formatting
23-
uses: actions/setup-python@v4
23+
uses: actions/setup-python@v6
2424
with:
2525
python-version: ${{ matrix.python-version }}
2626
architecture: x64
@@ -31,9 +31,9 @@ runs:
3131
python -m pip install --upgrade docformatter
3232
3333
- name: Install Go
34-
uses: actions/setup-go@v2
34+
uses: actions/setup-go@v6
3535
with:
36-
go-version: "1.23"
36+
go-version: "1.24"
3737

3838
- name: Install Go imports
3939
shell: bash

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
go-release:
2020
needs: get-dafny-version
21-
runs-on: macos-13
21+
runs-on: macos-14
2222
permissions:
2323
contents: write
2424
pull-requests: write
@@ -54,9 +54,9 @@ jobs:
5454
dafny-version: ${{ needs.get-dafny-version.outputs.version }}
5555

5656
- name: Install Go
57-
uses: actions/setup-go@v5
57+
uses: actions/setup-go@v6
5858
with:
59-
go-version: "1.23"
59+
go-version: "1.24"
6060

6161
- name: Install Go imports
6262
run: |

‎.github/workflows/library_codegen.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
# in this workflow.
3030
# The workflow installs black and docformatter and runs them on generated code.
3131
python-version: [3.11]
32-
go-version: [1.23]
32+
go-version: [1.24]
3333
os: [ubuntu-22.04]
3434
runs-on: ${{ matrix.os }}
3535
defaults:
@@ -58,12 +58,12 @@ jobs:
5858
dafny-version: ${{ inputs.dafny }}
5959

6060
- name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
61-
uses: actions/setup-dotnet@v3
61+
uses: actions/setup-dotnet@v5
6262
with:
6363
dotnet-version: ${{ matrix.dotnet-version }}
6464

6565
- name: Install Go
66-
uses: actions/setup-go@v5
66+
uses: actions/setup-go@v6
6767
with:
6868
go-version: ${{ matrix.go-version }}
6969

‎.github/workflows/library_go_tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ jobs:
2828
AwsCryptographicMaterialProviders,
2929
TestVectorsAwsCryptographicMaterialProviders,
3030
]
31-
go-version: ["1.23", "1.24", "1.25"]
31+
go-version: ["1.24", "1.25"]
3232
os: [
3333
# TODO fix Dafny-generated tests on Windows;
3434
# the sys.path workaround for generated Dafny doesn't work on Windows.
3535
# Note: only tests use the sys.path workaround, not source code.
3636
# Windows source code is tested downstream (ex. ESDK-Python CI).
3737
# windows-latest,
3838
ubuntu-22.04,
39-
macos-13,
39+
macos-14,
4040
]
4141
runs-on: ${{ matrix.os }}
4242
defaults:
@@ -69,7 +69,7 @@ jobs:
6969
dafny-version: ${{ inputs.dafny }}
7070

7171
- name: Install Go
72-
uses: actions/setup-go@v5
72+
uses: actions/setup-go@v6
7373
with:
7474
go-version: ${{ matrix.go-version }}
7575

‎.github/workflows/library_interop_tests.yml‎

Lines changed: 43 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
# https://taskei.amazon.dev/tasks/CrypTool-5283
2929
# windows-latest,
3030
ubuntu-22.04,
31-
macos-13,
31+
macos-14,
3232
]
3333
language: [java, net, rust, python, go]
3434
# https://taskei.amazon.dev/tasks/CrypTool-5284
@@ -62,20 +62,35 @@ jobs:
6262
# Set up runtimes
6363
- name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
6464
if: matrix.language == 'net'
65-
uses: actions/setup-dotnet@v3
65+
uses: actions/setup-dotnet@v5
6666
with:
6767
dotnet-version: ${{ matrix.dotnet-version }}
6868

69+
- name: Setup .NET OpenSSL on Mac
70+
if: matrix.os == 'macos-14' && matrix.language == 'net'
71+
run: |
72+
brew install openssl@3
73+
echo "DYLD_LIBRARY_PATH=$(brew --prefix openssl@3)/lib" >> $GITHUB_ENV
74+
echo "DOTNET_CRYPTO_ENGINE_ADAPTER=System.Security.Cryptography.Algorithms.Managed" >> $GITHUB_ENV
75+
76+
# We need both Java 8 and Java 17
77+
- name: Setup Java 8
78+
if: matrix.language == 'java'
79+
uses: actions/setup-java@v5
80+
with:
81+
distribution: "corretto"
82+
java-version: 8
83+
6984
# Setup Java in Rust is needed for running polymorph
7085
- name: Setup Java 17
7186
if: matrix.language == 'java' || matrix.language == 'rust'
72-
uses: actions/setup-java@v3
87+
uses: actions/setup-java@v5
7388
with:
7489
distribution: "corretto"
7590
java-version: 17
7691

7792
- name: Setup Python for running tests
78-
uses: actions/setup-python@v4
93+
uses: actions/setup-python@v6
7994
with:
8095
python-version: 3.11
8196
architecture: x64
@@ -90,14 +105,14 @@ jobs:
90105

91106
- name: Setup Rust Toolchain for GitHub CI
92107
if: matrix.language == 'rust'
93-
uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
108+
uses: actions-rust-lang/setup-rust-toolchain@v1
94109
with:
95110
components: rustfmt
96111

97112
- name: Setup Go
98-
uses: actions/setup-go@v5
113+
uses: actions/setup-go@v6
99114
with:
100-
go-version: "1.23"
115+
go-version: "1.24"
101116

102117
- name: Install Go imports
103118
run: |
@@ -191,12 +206,6 @@ jobs:
191206
run: |
192207
make purge_polymorph_code
193208
194-
- name: Setup gradle
195-
if: matrix.language == 'java'
196-
uses: gradle/gradle-build-action@v2
197-
with:
198-
gradle-version: 7.2
199-
200209
- name: Create Manifests
201210
working-directory: ./${{ matrix.library }}
202211
run: |
@@ -227,7 +236,7 @@ jobs:
227236
# TODO just test on mac and ubuntu for now
228237
# windows-latest,
229238
ubuntu-22.04,
230-
macos-13,
239+
macos-14,
231240
]
232241
decrypting_language: [java, net, rust, python, go]
233242
dotnet-version: ["6.0.x"]
@@ -260,20 +269,34 @@ jobs:
260269
# Set up runtimes
261270
- name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
262271
if: matrix.decrypting_language == 'net'
263-
uses: actions/setup-dotnet@v3
272+
uses: actions/setup-dotnet@v5
264273
with:
265274
dotnet-version: ${{ matrix.dotnet-version }}
266275

276+
- name: Setup .NET OpenSSL on Mac
277+
if: matrix.os == 'macos-14' && matrix.decrypting_language == 'net'
278+
run: |
279+
brew install openssl@3
280+
echo "DYLD_LIBRARY_PATH=$(brew --prefix openssl@3)/lib" >> $GITHUB_ENV
281+
echo "DOTNET_CRYPTO_ENGINE_ADAPTER=System.Security.Cryptography.Algorithms.Managed" >> $GITHUB_ENV
282+
283+
- name: Setup Java 8
284+
if: matrix.decrypting_language == 'java'
285+
uses: actions/setup-java@v5
286+
with:
287+
distribution: "corretto"
288+
java-version: 8
289+
267290
# Setup Java in Rust is needed for running polymorph
268291
- name: Setup Java 17
269292
if: matrix.decrypting_language == 'java' || matrix.decrypting_language == 'rust'
270-
uses: actions/setup-java@v3
293+
uses: actions/setup-java@v5
271294
with:
272295
distribution: "corretto"
273296
java-version: 17
274297

275298
- name: Setup Python for running tests
276-
uses: actions/setup-python@v4
299+
uses: actions/setup-python@v6
277300
with:
278301
python-version: 3.11
279302
architecture: x64
@@ -284,14 +307,14 @@ jobs:
284307
285308
- name: Setup Rust Toolchain for GitHub CI
286309
if: matrix.decrypting_language == 'rust'
287-
uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
310+
uses: actions-rust-lang/setup-rust-toolchain@v1
288311
with:
289312
components: rustfmt
290313

291314
- name: Setup Go
292-
uses: actions/setup-go@v5
315+
uses: actions/setup-go@v6
293316
with:
294-
go-version: "1.23"
317+
go-version: "1.24"
295318

296319
- name: Install Go imports
297320
run: |

‎.github/workflows/library_java_tests.yml‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ jobs:
3131
# TODO just test on mac for now
3232
# windows-latest,
3333
ubuntu-22.04,
34-
macos-13,
34+
macos-14,
3535
]
36-
java-versions: [8, 11, 16, 17]
36+
java-versions: [8, 11, 17, 19]
3737
runs-on: ${{ matrix.os }}
3838
permissions:
3939
id-token: write
@@ -82,8 +82,15 @@ jobs:
8282
# arguments: copyKeysJSON
8383
# build-root-directory: ./TestVectorsAwsCryptographicMaterialProviders/runtimes/java
8484

85+
- name: Setup Java 8, for complex reasons
86+
if: ${{matrix.java-versions}} != 8
87+
uses: actions/setup-java@v5
88+
with:
89+
distribution: "corretto"
90+
java-version: 8
91+
8592
- name: Setup Java ${{matrix.java-versions}}
86-
uses: actions/setup-java@v3
93+
uses: actions/setup-java@v5
8794
with:
8895
distribution: "corretto"
8996
java-version: ${{matrix.java-versions}}

‎.github/workflows/library_net_tests.yml‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
TestVectorsAwsCryptographicMaterialProviders,
3030
]
3131
dotnet-version: ["6.0.x"]
32-
os: [windows-latest, ubuntu-22.04, macos-13]
32+
os: [windows-latest, ubuntu-22.04, macos-14]
3333
runs-on: ${{ matrix.os }}
3434
defaults:
3535
run:
@@ -59,10 +59,18 @@ jobs:
5959
- run: git submodule update --init --recursive smithy-dafny
6060

6161
- name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
62-
uses: actions/setup-dotnet@v3
62+
uses: actions/setup-dotnet@v5
6363
with:
6464
dotnet-version: ${{ matrix.dotnet-version }}
6565

66+
- name: Setup .NET OpenSSL on Mac
67+
if: matrix.os == 'macos-14'
68+
run: |
69+
brew install openssl@3
70+
echo "DYLD_LIBRARY_PATH=$(brew --prefix openssl@3)/lib" >> $GITHUB_ENV
71+
echo "DOTNET_SYSTEM_SECURITY_CRYPTOGRAPHY_OPENSSL_OVERRIDE_VERSION_CHECK=1" >> $GITHUB_ENV
72+
echo "DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0" >> $GITHUB_ENV
73+
6674
- name: Setup Dafny
6775
uses: ./.github/actions/setup_dafny
6876
with:
@@ -109,11 +117,7 @@ jobs:
109117
working-directory: ./${{ matrix.library }}
110118
shell: bash
111119
run: |
112-
if [ "$RUNNER_OS" == "macOS" ]; then
113-
make test_net_mac_intel FRAMEWORK=net6.0
114-
else
115-
make test_net FRAMEWORK=net6.0
116-
fi
120+
make test_net FRAMEWORK=net6.0
117121
118122
- name: Test Cache Thread Safety net6.0
119123
if: matrix.library == 'AwsCryptographicMaterialProviders'

‎.github/workflows/library_python_tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
# Windows source code is tested downstream (ex. ESDK-Python CI).
3737
# windows-latest,
3838
ubuntu-22.04,
39-
macos-13,
39+
macos-14,
4040
]
4141
runs-on: ${{ matrix.os }}
4242
defaults:
@@ -69,7 +69,7 @@ jobs:
6969
dafny-version: ${{ inputs.dafny }}
7070

7171
- name: Setup Python ${{ matrix.python-version }} for running tests
72-
uses: actions/setup-python@v4
72+
uses: actions/setup-python@v6
7373
with:
7474
python-version: ${{ matrix.python-version }}
7575
architecture: x64

‎.github/workflows/library_rust_tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
TestVectorsAwsCryptographicMaterialProviders,
3030
]
3131
# removed windows-latest because somehow it can't build aws-lc in CI
32-
os: [ubuntu-22.04, macos-13]
32+
os: [ubuntu-22.04, macos-14]
3333
runs-on: ${{ matrix.os }}
3434
permissions:
3535
id-token: write
@@ -55,7 +55,7 @@ jobs:
5555
role-session-name: RustTests
5656

5757
- name: Setup Rust Toolchain for GitHub CI
58-
uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
58+
uses: actions-rust-lang/setup-rust-toolchain@v1
5959
with:
6060
components: rustfmt
6161

@@ -70,7 +70,7 @@ jobs:
7070

7171
# Go is needed for aws-lc-FIPS
7272
- name: Install Go
73-
uses: actions/setup-go@v5
73+
uses: actions/setup-go@v6
7474
with:
7575
go-version: ">=1.18"
7676

‎.github/workflows/sem_ver.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
jobs:
88
semantic-release:
9-
runs-on: macos-13
9+
runs-on: macos-14
1010
permissions:
1111
id-token: write
1212
contents: read
@@ -27,7 +27,7 @@ jobs:
2727
role-session-name: CI_Bot_Release
2828

2929
- name: Upgrade Node
30-
uses: actions/setup-node@v4
30+
uses: actions/setup-node@v5
3131
with:
3232
node-version: 20
3333

0 commit comments

Comments
 (0)