Skip to content

Commit b1a7740

Browse files
committed
m
1 parent 7b8ff10 commit b1a7740

File tree

6 files changed

+32
-58
lines changed

6 files changed

+32
-58
lines changed

.github/workflows/ci_test_go.yml

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
fail-fast: false
3030
matrix:
3131
library: [DynamoDbEncryption, TestVectors]
32-
os: [ubuntu-22.04, macos-14]
32+
os: [ubuntu-22.04, macos-15-intel]
3333
go-version: ["1.23", "1.24", "1.25"]
3434
runs-on: ${{ matrix.os }}
3535
permissions:
@@ -43,27 +43,16 @@ jobs:
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-
- name: Install Java
47-
uses: actions/setup-java@v5
48-
with:
49-
distribution: "corretto"
50-
java-version: "11" # DynamoDB Local requires Java
51-
52-
- name: Download DynamoDB Local
53-
run: |
54-
wget https://dynamodb-local.s3.amazonaws.com/dynamodb_local_latest.tar.gz
55-
tar -xf dynamodb_local_latest.tar.gz
56-
57-
- name: Start DynamoDB Local
58-
run: java -Djava.library.path=./DynamoDBLocal_lib -jar DynamoDBLocal.jar -inMemory -sharedDb &
59-
# The & runs the Java process in the background.
46+
- name: Setup Docker
47+
if: matrix.os == 'macos-15-intel' && matrix.library == 'TestVectors'
48+
uses: douglascamata/[email protected]
6049

61-
- name: Wait for DynamoDB Local
62-
run: |
63-
echo "Waiting for DynamoDB Local to start..."
64-
until curl -s http://localhost:8000; do
65-
sleep 1
66-
done
50+
- name: Setup DynamoDB Local
51+
if: matrix.library == 'TestVectors'
52+
uses: rrainn/[email protected]
53+
with:
54+
port: 8000
55+
cors: "*"
6756

6857
- name: Support longpaths
6958
run: |

.github/workflows/ci_test_latest_released_mpl_java.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
submodules: recursive
4949

5050
- name: Setup Java ${{ matrix.java-version }}
51-
uses: actions/setup-java@v4
51+
uses: actions/setup-java@v5
5252
with:
5353
distribution: "corretto"
5454
java-version: ${{ matrix.java-version }}

.github/workflows/ci_test_vector_net.yml

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
os: [
2929
# Run on ubuntu image that comes pre-configured with docker
3030
ubuntu-22.04,
31-
macos-14,
31+
macos-15-intel,
3232
]
3333
runs-on: ${{ matrix.os }}
3434
permissions:
@@ -42,27 +42,16 @@ jobs:
4242
role-to-assume: arn:aws:iam::370957321024:role/GitHub-CI-DDBEC-Dafny-Role-us-west-2
4343
role-session-name: DDBEC-Dafny-DotNet-Tests
4444

45-
- name: Install Java
46-
uses: actions/setup-java@v5
47-
with:
48-
distribution: "corretto"
49-
java-version: "11" # DynamoDB Local requires Java
50-
51-
- name: Download DynamoDB Local
52-
run: |
53-
wget https://dynamodb-local.s3.amazonaws.com/dynamodb_local_latest.tar.gz
54-
tar -xf dynamodb_local_latest.tar.gz
45+
- name: Setup Docker
46+
if: matrix.os == 'macos-15-intel' && matrix.library == 'TestVectors'
47+
uses: douglascamata/[email protected]
5548

56-
- name: Start DynamoDB Local
57-
run: java -Djava.library.path=./DynamoDBLocal_lib -jar DynamoDBLocal.jar -inMemory -sharedDb &
58-
# The & runs the Java process in the background.
59-
60-
- name: Wait for DynamoDB Local
61-
run: |
62-
echo "Waiting for DynamoDB Local to start..."
63-
until curl -s http://localhost:8000; do
64-
sleep 1
65-
done
49+
- name: Setup DynamoDB Local
50+
if: matrix.library == 'TestVectors'
51+
uses: rrainn/[email protected]
52+
with:
53+
port: 8000
54+
cors: "*"
6655

6756
- uses: actions/checkout@v3
6857
with:

.github/workflows/dafny_interop_test_vector_java.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
git rev-parse HEAD
7070
7171
- name: Setup Java ${{ matrix.java-version }}
72-
uses: actions/setup-java@v4
72+
uses: actions/setup-java@v5
7373
with:
7474
distribution: "corretto"
7575
java-version: ${{ matrix.java-version }}

.github/workflows/dafny_interop_test_vector_net.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
fetch-depth: 0
4848

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

.github/workflows/library_rust_tests.yml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,16 @@ jobs:
4141
role-to-assume: arn:aws:iam::370957321024:role/GitHub-CI-DDBEC-Dafny-Role-us-west-2
4242
role-session-name: DDBEC-Dafny-Rust-Tests
4343

44-
- name: Install Java
45-
uses: actions/setup-java@v5
46-
with:
47-
distribution: "corretto"
48-
java-version: "11" # DynamoDB Local requires Java
44+
- name: Setup Docker
45+
if: matrix.os == 'macos-15-intel' && matrix.library == 'TestVectors'
46+
uses: douglascamata/[email protected]
4947

50-
- name: Download DynamoDB Local
51-
run: |
52-
wget https://dynamodb-local.s3.amazonaws.com/dynamodb_local_latest.tar.gz
53-
tar -xf dynamodb_local_latest.tar.gz
54-
55-
- name: Start DynamoDB Local
56-
run: java -Djava.library.path=./DynamoDBLocal_lib -jar DynamoDBLocal.jar -inMemory -sharedDb &
57-
# The & runs the Java process in the background.
48+
- name: Setup DynamoDB Local
49+
if: matrix.library == 'TestVectors'
50+
uses: rrainn/[email protected]
51+
with:
52+
port: 8000
53+
cors: "*"
5854

5955
- name: Support longpaths on Git checkout
6056
run: |

0 commit comments

Comments
 (0)