Skip to content

Commit fd4f6e4

Browse files
ajewellamzajewellamz
committed
m
1 parent 0ccf143 commit fd4f6e4

File tree

7 files changed

+40
-106
lines changed

7 files changed

+40
-106
lines changed

‎.github/workflows/ci_test_go.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@ jobs:
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: Install Java
4047
uses: actions/setup-java@v5
4148
with:
@@ -48,7 +55,7 @@ jobs:
4855
tar -xf dynamodb_local_latest.tar.gz
4956
5057
- name: Start DynamoDB Local
51-
run: java -Djava.library.path=./DynamoDBLocal_lib -jar DynamoDBLocal.jar -inMemory -sharedDb -noAuth &
58+
run: java -Djava.library.path=./DynamoDBLocal_lib -jar DynamoDBLocal.jar -inMemory -sharedDb &
5259
# The & runs the Java process in the background.
5360

5461
- name: Wait for DynamoDB Local
@@ -62,13 +69,6 @@ jobs:
6269
run: |
6370
git config --global core.longpaths true
6471
65-
- name: Configure AWS Credentials
66-
uses: aws-actions/configure-aws-credentials@v4
67-
with:
68-
aws-region: us-west-2
69-
role-to-assume: arn:aws:iam::370957321024:role/GitHub-CI-DDBEC-Dafny-Role-us-west-2
70-
role-session-name: DDBEC-Dafny-Java-Tests
71-
7272
- uses: actions/checkout@v3
7373
with:
7474
submodules: recursive

‎.github/workflows/ci_test_latest_released_mpl_java.yml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,8 @@ 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-
5650
- name: Setup Java ${{ matrix.java-version }}
57-
uses: actions/setup-java@v5
51+
uses: actions/setup-java@v4
5852
with:
5953
distribution: "corretto"
6054
java-version: ${{ matrix.java-version }}
@@ -119,7 +113,7 @@ jobs:
119113
working-directory: ./TestVectors
120114
run: |
121115
# Spin up ddb local
122-
docker run --name dynamodb -d -p 8000:8000 amazon/dynamodb-local -jar DynamoDBLocal.jar -port 8000 -noAuth -inMemory -cors *
116+
docker run --name dynamodb -d -p 8000:8000 amazon/dynamodb-local -jar DynamoDBLocal.jar -port 8000 -inMemory -cors *
123117
# Run transpile by itself so we don't locally build the MPL.
124118
make transpile_implementation_java
125119
make transpile_test_java

‎.github/workflows/ci_test_vector_java.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
- name: Start DynamoDB Local
6161
run: |
6262
java -Djava.library.path=./DynamoDBLocal_lib -jar DynamoDBLocal.jar \
63-
-inMemory -sharedDb -port 8000 -noAuth > dynamodb-local.log 2>&1 &
63+
-inMemory -sharedDb -port 8000 -cors '*' > dynamodb-local.log 2>&1 &
6464
echo $! > dynamodb-local.pid
6565
6666
- name: Wait for DynamoDB Local

‎.github/workflows/ci_test_vector_net.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ jobs:
3535
id-token: write
3636
contents: read
3737
steps:
38+
- name: Configure AWS Credentials
39+
uses: aws-actions/configure-aws-credentials@v5
40+
with:
41+
aws-region: us-west-2
42+
role-to-assume: arn:aws:iam::370957321024:role/GitHub-CI-DDBEC-Dafny-Role-us-west-2
43+
role-session-name: DDBEC-Dafny-DotNet-Tests
44+
3845
- name: Install Java
3946
uses: actions/setup-java@v5
4047
with:
@@ -47,7 +54,7 @@ jobs:
4754
tar -xf dynamodb_local_latest.tar.gz
4855
4956
- name: Start DynamoDB Local
50-
run: java -Djava.library.path=./DynamoDBLocal_lib -jar DynamoDBLocal.jar -inMemory -sharedDb -noAuth &
57+
run: java -Djava.library.path=./DynamoDBLocal_lib -jar DynamoDBLocal.jar -inMemory -sharedDb &
5158
# The & runs the Java process in the background.
5259

5360
- name: Wait for DynamoDB Local
@@ -57,13 +64,6 @@ jobs:
5764
sleep 1
5865
done
5966
60-
- name: Configure AWS Credentials
61-
uses: aws-actions/configure-aws-credentials@v4
62-
with:
63-
aws-region: us-west-2
64-
role-to-assume: arn:aws:iam::370957321024:role/GitHub-CI-DDBEC-Dafny-Role-us-west-2
65-
role-session-name: DDBEC-Dafny-DotNet-Tests
66-
6767
- uses: actions/checkout@v3
6868
with:
6969
submodules: recursive

‎.github/workflows/dafny_interop_test_vector_java.yml‎

Lines changed: 8 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
strategy:
2828
matrix:
2929
library: [TestVectors]
30-
java-version: [8, 11, 17, 19]
30+
java-version: [8, 11, 16, 17]
3131
os: [
3232
# Run on ubuntu image that comes pre-configured with docker
3333
ubuntu-22.04,
@@ -37,49 +37,19 @@ jobs:
3737
id-token: write
3838
contents: read
3939
steps:
40+
- name: Setup DynamoDB Local
41+
uses: rrainn/[email protected]
42+
with:
43+
port: 8000
44+
cors: "*"
45+
4046
- name: Configure AWS Credentials
4147
uses: aws-actions/configure-aws-credentials@v4
4248
with:
4349
aws-region: us-west-2
4450
role-to-assume: arn:aws:iam::370957321024:role/GitHub-CI-DDBEC-Dafny-Role-us-west-2
4551
role-session-name: DDBEC-Dafny-Java-Tests
4652

47-
- name: Install Java
48-
uses: actions/setup-java@v5
49-
with:
50-
distribution: "corretto"
51-
java-version: "11" # DynamoDB Local requires Java
52-
53-
- name: Download DynamoDB Local
54-
run: |
55-
wget https://dynamodb-local.s3.amazonaws.com/dynamodb_local_latest.tar.gz
56-
tar -xf dynamodb_local_latest.tar.gz
57-
58-
- name: Start DynamoDB Local
59-
run: |
60-
java -Djava.library.path=./DynamoDBLocal_lib -jar DynamoDBLocal.jar \
61-
-inMemory -sharedDb -port 8000 > dynamodb-local.log 2>&1 &
62-
echo $! > dynamodb-local.pid
63-
64-
- name: Wait for DynamoDB Local
65-
run: |
66-
echo "Waiting for DynamoDB Local to start..."
67-
for i in {1..30}; do
68-
if curl -s -f http://localhost:8000 > /dev/null 2>&1; then
69-
echo "DynamoDB Local is ready"
70-
break
71-
fi
72-
echo "Attempt $i: DynamoDB Local not ready yet..."
73-
sleep 2
74-
done
75-
# Verify it's actually working with dummy credentials
76-
curl -X POST http://localhost:8000 \
77-
-H "Content-Type: application/x-amz-json-1.0" \
78-
-H "X-Amz-Target: DynamoDB_20120810.ListTables" \
79-
-H "Authorization: AWS4-HMAC-SHA256 Credential=dummy/20230101/us-east-1/dynamodb/aws4_request, SignedHeaders=host;x-amz-date, Signature=dummy" \
80-
-H "X-Amz-Date: 20230101T000000Z" \
81-
-d '{}' || (cat dynamodb-local.log && exit 1)
82-
8353
- uses: actions/checkout@v3
8454
with:
8555
submodules: recursive
@@ -98,14 +68,8 @@ jobs:
9868
git submodule update --init --recursive
9969
git rev-parse HEAD
10070
101-
- name: Setup Java 8
102-
uses: actions/setup-java@v5
103-
with:
104-
distribution: "corretto"
105-
java-version: 8
106-
10771
- name: Setup Java ${{ matrix.java-version }}
108-
uses: actions/setup-java@v5
72+
uses: actions/setup-java@v4
10973
with:
11074
distribution: "corretto"
11175
java-version: ${{ matrix.java-version }}

‎.github/workflows/dafny_interop_test_vector_net.yml‎

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -33,28 +33,11 @@ jobs:
3333
DOTNET_CLI_TELEMETRY_OPTOUT: 1
3434
DOTNET_NOLOGO: 1
3535
steps:
36-
- name: Install Java
37-
uses: actions/setup-java@v5
36+
- name: Setup DynamoDB Local
37+
uses: rrainn/[email protected]
3838
with:
39-
distribution: "corretto"
40-
java-version: "11" # DynamoDB Local requires Java
41-
42-
- name: Download DynamoDB Local
43-
run: |
44-
wget https://dynamodb-local.s3.amazonaws.com/dynamodb_local_latest.tar.gz
45-
tar -xf dynamodb_local_latest.tar.gz
46-
47-
- name: Start DynamoDB Local
48-
run: java -Djava.library.path=./DynamoDBLocal_lib -jar DynamoDBLocal.jar -inMemory -sharedDb -noAuth &
49-
# The & runs the Java process in the background.
50-
51-
- name: Wait for DynamoDB Local
52-
run: |
53-
echo "Waiting for DynamoDB Local to start..."
54-
until curl -s http://localhost:8000; do
55-
sleep 1
56-
done
57-
39+
port: 8000
40+
cors: "*"
5841
- name: Support longpaths on Git checkout
5942
run: |
6043
git config --global core.longpaths true
@@ -64,17 +47,10 @@ jobs:
6447
fetch-depth: 0
6548

6649
- name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
67-
uses: actions/setup-dotnet@v5
50+
uses: actions/setup-dotnet@v4
6851
with:
6952
dotnet-version: ${{ matrix.dotnet-version }}
7053

71-
- name: Setup .NET OpenSSL on Mac
72-
if: matrix.os == 'macos-14' && matrix.language == 'net'
73-
run: |
74-
brew install openssl@3
75-
echo "DYLD_LIBRARY_PATH=$(brew --prefix openssl@3)/lib" >> $GITHUB_ENV
76-
echo "DOTNET_CRYPTO_ENGINE_ADAPTER=System.Security.Cryptography.Algorithms.Managed" >> $GITHUB_ENV
77-
7854
- name: Setup MPL Dafny
7955
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
8056
with:

‎.github/workflows/library_rust_tests.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ jobs:
3434
env:
3535
RUST_MIN_STACK: 838860800
3636
steps:
37+
- name: Configure AWS Credentials
38+
uses: aws-actions/configure-aws-credentials@v4
39+
with:
40+
aws-region: us-west-2
41+
role-to-assume: arn:aws:iam::370957321024:role/GitHub-CI-DDBEC-Dafny-Role-us-west-2
42+
role-session-name: DDBEC-Dafny-Rust-Tests
43+
3744
- name: Install Java
3845
uses: actions/setup-java@v5
3946
with:
@@ -46,7 +53,7 @@ jobs:
4653
tar -xf dynamodb_local_latest.tar.gz
4754
4855
- name: Start DynamoDB Local
49-
run: java -Djava.library.path=./DynamoDBLocal_lib -jar DynamoDBLocal.jar -inMemory -sharedDb -noAuth &
56+
run: java -Djava.library.path=./DynamoDBLocal_lib -jar DynamoDBLocal.jar -inMemory -sharedDb &
5057
# The & runs the Java process in the background.
5158

5259
- name: Support longpaths on Git checkout
@@ -59,13 +66,6 @@ jobs:
5966
git submodule update --init --recursive submodules/smithy-dafny
6067
git submodule update --init --recursive submodules/MaterialProviders
6168
62-
- name: Configure AWS Credentials
63-
uses: aws-actions/configure-aws-credentials@v4
64-
with:
65-
aws-region: us-west-2
66-
role-to-assume: arn:aws:iam::370957321024:role/GitHub-CI-DDBEC-Dafny-Role-us-west-2
67-
role-session-name: DDBEC-Dafny-Rust-Tests
68-
6969
- name: Wait for DynamoDB Local
7070
run: |
7171
echo "Waiting for DynamoDB Local to start..."

0 commit comments

Comments
 (0)