Skip to content

Commit e0d2b77

Browse files
ajewellamzajewellamz
authored
chore: use macos-14 for CI (#1998)
1 parent 95168a2 commit e0d2b77

34 files changed

+208
-149
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 submodules/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,14 +31,14 @@ 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:
3636
go-version: "1.23"
3737

3838
- name: Install Go imports
3939
shell: bash
4040
run: |
41-
go install golang.org/x/tools/cmd/goimports@latest
41+
go install golang.org/x/tools/cmd/goimports@v0.36.0
4242
4343
# Without this the if-dafny-at-least command includes "Downloading ..." output
4444
- name: Arbitrary makefile target to force downloading Gradle

‎.github/workflows/check-files.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
# to add more allowlisted approvers just modify this env variable
1717
maintainers: seebees, texastony, ShubhamChaturvedi7, lucasmcdonald3, josecorella, imabhichow, rishav-karanjit, antonf-amzn, kessplas, ajewellamz, RitvikKapila
1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v5
2020
with:
2121
fetch-depth: 0
2222

‎.github/workflows/check_only_key_word.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
issues: write
1414
pull-requests: write
1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v5
1717
with:
1818
fetch-depth: 0
1919

‎.github/workflows/ci_codegen.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
run: |
3232
git config --global core.longpaths true
3333
34-
- uses: actions/checkout@v3
34+
- uses: actions/checkout@v5
3535
with:
3636
submodules: recursive
3737
- run: git submodule update --init --recursive submodules/smithy-dafny
@@ -45,20 +45,20 @@ jobs:
4545
dafny-version: ${{ inputs.dafny }}
4646

4747
- name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
48-
uses: actions/setup-dotnet@v4
48+
uses: actions/setup-dotnet@v5
4949
with:
5050
dotnet-version: ${{ matrix.dotnet-version }}
5151

5252
- name: Install Go
53-
uses: actions/setup-go@v5
53+
uses: actions/setup-go@v6
5454
with:
5555
go-version: ${{ matrix.go-version }}
5656

5757
- name: Create temporary global.json
5858
run: echo '{"sdk":{"rollForward":"latestFeature","version":"6.0.0"}}' > ./global.json
5959

6060
- name: Setup Java 17 for codegen
61-
uses: actions/setup-java@v4
61+
uses: actions/setup-java@v5
6262
with:
6363
distribution: "corretto"
6464
java-version: "17"

‎.github/workflows/ci_duvet.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
duvet:
1414
runs-on: ubuntu-22.04
1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v5
1717

1818
- name: Install duvet
1919
shell: bash

‎.github/workflows/ci_examples_java.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,32 @@ jobs:
2727
testJava:
2828
strategy:
2929
matrix:
30-
java-version: [8, 11, 16, 17]
31-
os: [macos-13]
30+
java-version: [8, 11, 17, 19]
31+
os: [macos-14]
3232
runs-on: ${{ matrix.os }}
3333
permissions:
3434
id-token: write
3535
contents: read
3636
steps:
3737
- name: Configure AWS Credentials
38-
uses: aws-actions/configure-aws-credentials@v4
38+
uses: aws-actions/configure-aws-credentials@v5
3939
with:
4040
aws-region: us-west-2
4141
role-to-assume: arn:aws:iam::370957321024:role/GitHub-CI-DDBEC-Dafny-Role-us-west-2
4242
role-session-name: DDBEC-Dafny-Java-Tests
4343

44-
- uses: actions/checkout@v3
44+
- uses: actions/checkout@v5
4545
with:
4646
submodules: recursive
4747

48+
- name: Setup Java 8
49+
uses: actions/setup-java@v5
50+
with:
51+
distribution: "corretto"
52+
java-version: 8
53+
4854
- name: Setup Java ${{ matrix.java-version }}
49-
uses: actions/setup-java@v4
55+
uses: actions/setup-java@v5
5056
with:
5157
distribution: "corretto"
5258
java-version: ${{ matrix.java-version }}

‎.github/workflows/ci_examples_net.yml‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
matrix:
2828
library: [DynamoDbEncryption]
2929
dotnet-version: ["6.0.x"]
30-
os: [macos-13]
30+
os: [macos-14]
3131
runs-on: ${{ matrix.os }}
3232
permissions:
3333
id-token: write
@@ -36,15 +36,22 @@ jobs:
3636
DOTNET_CLI_TELEMETRY_OPTOUT: 1
3737
DOTNET_NOLOGO: 1
3838
steps:
39-
- uses: actions/checkout@v3
39+
- uses: actions/checkout@v5
4040
with:
4141
submodules: recursive
4242

4343
- name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
44-
uses: actions/setup-dotnet@v4
44+
uses: actions/setup-dotnet@v5
4545
with:
4646
dotnet-version: ${{ matrix.dotnet-version }}
4747

48+
- name: Setup .NET OpenSSL on Mac
49+
if: matrix.os == 'macos-14'
50+
run: |
51+
brew install openssl@3
52+
echo "DYLD_LIBRARY_PATH=$(brew --prefix openssl@3)/lib" >> $GITHUB_ENV
53+
echo "DOTNET_CRYPTO_ENGINE_ADAPTER=System.Security.Cryptography.Algorithms.Managed" >> $GITHUB_ENV
54+
4855
- name: Setup Dafny
4956
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
5057
with:
@@ -76,7 +83,7 @@ jobs:
7683
run: make setup_net
7784

7885
- name: Configure AWS Credentials
79-
uses: aws-actions/configure-aws-credentials@v4
86+
uses: aws-actions/configure-aws-credentials@v5
8087
with:
8188
aws-region: us-west-2
8289
role-to-assume: arn:aws:iam::370957321024:role/GitHub-CI-DDBEC-Dafny-Role-us-west-2

‎.github/workflows/ci_static_analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ jobs:
1111
not-grep:
1212
runs-on: ubuntu-22.04
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v5
1515
- name: not-grep
1616
uses: mattsb42-meta/not-grep@1.0.0

‎.github/workflows/ci_test_go.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,23 @@ jobs:
2929
fail-fast: false
3030
matrix:
3131
library: [DynamoDbEncryption, TestVectors]
32-
os: [ubuntu-22.04, macos-13]
32+
os: [ubuntu-22.04, macos-15-intel]
3333
go-version: ["1.23", "1.24", "1.25"]
3434
runs-on: ${{ matrix.os }}
3535
permissions:
3636
id-token: write
3737
contents: read
3838
steps:
39+
- name: Configure AWS Credentials
40+
uses: aws-actions/configure-aws-credentials@v5
41+
with:
42+
aws-region: us-west-2
43+
role-to-assume: arn:aws:iam::370957321024:role/GitHub-CI-DDBEC-Dafny-Role-us-west-2
44+
role-session-name: DDBEC-Dafny-Java-Tests
45+
3946
- name: Setup Docker
40-
if: matrix.os == 'macos-13' && matrix.library == 'TestVectors'
41-
uses: douglascamata/setup-docker-macos-action@v1-alpha
47+
if: matrix.os == 'macos-15-intel' && matrix.library == 'TestVectors'
48+
uses: douglascamata/setup-docker-macos-action@v1.0.1
4249

4350
- name: Setup DynamoDB Local
4451
if: matrix.library == 'TestVectors'
@@ -51,14 +58,7 @@ jobs:
5158
run: |
5259
git config --global core.longpaths true
5360
54-
- name: Configure AWS Credentials
55-
uses: aws-actions/configure-aws-credentials@v4
56-
with:
57-
aws-region: us-west-2
58-
role-to-assume: arn:aws:iam::370957321024:role/GitHub-CI-DDBEC-Dafny-Role-us-west-2
59-
role-session-name: DDBEC-Dafny-Java-Tests
60-
61-
- uses: actions/checkout@v3
61+
- uses: actions/checkout@v5
6262
with:
6363
submodules: recursive
6464

@@ -71,7 +71,7 @@ jobs:
7171
run: echo '{"sdk":{"rollForward":"latestFeature","version":"6.0.0"}}' > ./global.json
7272

7373
- name: Setup Java 17 for codegen
74-
uses: actions/setup-java@v3
74+
uses: actions/setup-java@v5
7575
with:
7676
distribution: "corretto"
7777
java-version: "17"
@@ -91,11 +91,11 @@ jobs:
9191
sed "s/mplDependencyJavaVersion=.*/mplDependencyJavaVersion=${{inputs.mpl-version}}/g" project.properties > project.properties2; mv project.properties2 project.properties
9292
9393
- name: Install Go
94-
uses: actions/setup-go@v5
94+
uses: actions/setup-go@v6
9595
with:
9696
go-version: ${{ matrix.go-version }}
9797

98-
- uses: actions/checkout@v3
98+
- uses: actions/checkout@v5
9999
- name: Init Submodules
100100
shell: bash
101101
run: |

‎.github/workflows/ci_test_java.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,21 @@ jobs:
2929
fail-fast: false
3030
matrix:
3131
library: [DynamoDbEncryption]
32-
java-version: [8, 11, 16, 17]
33-
os: [macos-13]
32+
java-version: [8, 11, 17, 19]
33+
os: [macos-14]
3434
runs-on: ${{ matrix.os }}
3535
permissions:
3636
id-token: write
3737
contents: read
3838
steps:
3939
- name: Configure AWS Credentials
40-
uses: aws-actions/configure-aws-credentials@v4
40+
uses: aws-actions/configure-aws-credentials@v5
4141
with:
4242
aws-region: us-west-2
4343
role-to-assume: arn:aws:iam::370957321024:role/GitHub-CI-DDBEC-Dafny-Role-us-west-2
4444
role-session-name: DDBEC-Dafny-Java-Tests
4545

46-
- uses: actions/checkout@v3
46+
- uses: actions/checkout@v5
4747
with:
4848
submodules: recursive
4949

@@ -78,8 +78,14 @@ jobs:
7878
diff-generated-code: false
7979
update-and-regenerate-mpl: true
8080

81+
- name: Setup Java 8
82+
uses: actions/setup-java@v5
83+
with:
84+
distribution: "corretto"
85+
java-version: 8
86+
8187
- name: Setup Java ${{ matrix.java-version }}
82-
uses: actions/setup-java@v4
88+
uses: actions/setup-java@v5
8389
with:
8490
distribution: "corretto"
8591
java-version: ${{ matrix.java-version }}

0 commit comments

Comments
 (0)