Skip to content

Commit d421c83

Browse files
ajewellamzajewellamz
committed
m
1 parent ecffe86 commit d421c83

21 files changed

+110
-34
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/ci_codegen.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ 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

‎.github/workflows/ci_examples_java.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
testJava:
2828
strategy:
2929
matrix:
30-
java-version: [8, 11, 17]
30+
java-version: [8, 11, 17, 19]
3131
os: [macos-14]
3232
runs-on: ${{ matrix.os }}
3333
permissions:
@@ -45,6 +45,12 @@ jobs:
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 }}
4955
uses: actions/setup-java@v5
5056
with:

‎.github/workflows/ci_examples_net.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,17 @@ jobs:
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' && matrix.language == 'net'
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:

‎.github/workflows/ci_test_go.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ 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

‎.github/workflows/ci_test_java.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
fail-fast: false
3030
matrix:
3131
library: [DynamoDbEncryption]
32-
java-version: [8, 11, 17]
32+
java-version: [8, 11, 17, 19]
3333
os: [macos-14]
3434
runs-on: ${{ matrix.os }}
3535
permissions:
@@ -78,6 +78,12 @@ 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 }}
8288
uses: actions/setup-java@v5
8389
with:

‎.github/workflows/ci_test_latest_released_mpl_java.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@ jobs:
4747
with:
4848
submodules: recursive
4949

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

‎.github/workflows/ci_test_net.yml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,17 @@ jobs:
4242
submodules: recursive
4343

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

49+
- name: Setup .NET OpenSSL on Mac
50+
if: matrix.os == 'macos-14' && matrix.language == 'net'
51+
run: |
52+
brew install openssl@3
53+
echo "DYLD_LIBRARY_PATH=$(brew --prefix openssl@3)/lib" >> $GITHUB_ENV
54+
echo "DOTNET_CRYPTO_ENGINE_ADAPTER=System.Security.Cryptography.Algorithms.Managed" >> $GITHUB_ENV
55+
4956
- name: Setup Dafny
5057
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
5158
with:
@@ -106,11 +113,7 @@ jobs:
106113
run: |
107114
dotnet restore runtimes/net/tests
108115
dotnet build runtimes/net/tests
109-
if [ "$RUNNER_OS" == "macOS" ]; then
110-
make test_net_mac_intel
111-
else
112-
make test_net FRAMEWORK=net6.0
113-
fi
116+
make test_net FRAMEWORK=net6.0
114117
115118
- name: Test Build and Pack ${{ matrix.library}}
116119
shell: bash

‎.github/workflows/ci_test_vector_java.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
strategy:
2929
matrix:
3030
library: [TestVectors]
31-
java-version: [8, 11, 17]
31+
java-version: [8, 11, 17, 19]
3232
os: [
3333
# Run on ubuntu image that comes pre-configured with docker
3434
ubuntu-22.04,
@@ -91,6 +91,12 @@ jobs:
9191
diff-generated-code: false
9292
update-and-regenerate-mpl: true
9393

94+
- name: Setup Java 8
95+
uses: actions/setup-java@v5
96+
with:
97+
distribution: "corretto"
98+
java-version: 8
99+
94100
- name: Setup Java ${{ matrix.java-version }}
95101
uses: actions/setup-java@v5
96102
with:

‎.github/workflows/ci_test_vector_net.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,17 @@ jobs:
8383
update-and-regenerate-mpl: true
8484

8585
- name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
86-
uses: actions/setup-dotnet@v4
86+
uses: actions/setup-dotnet@v5
8787
with:
8888
dotnet-version: ${{ matrix.dotnet-version }}
8989

90+
- name: Setup .NET OpenSSL on Mac
91+
if: matrix.os == 'macos-14' && matrix.language == 'net'
92+
run: |
93+
brew install openssl@3
94+
echo "DYLD_LIBRARY_PATH=$(brew --prefix openssl@3)/lib" >> $GITHUB_ENV
95+
echo "DOTNET_CRYPTO_ENGINE_ADAPTER=System.Security.Cryptography.Algorithms.Managed" >> $GITHUB_ENV
96+
9097
- name: Build TestVectors implementation
9198
shell: bash
9299
working-directory: ${{matrix.library}}

0 commit comments

Comments
 (0)