Skip to content

Commit 5f128f7

Browse files
authored
Merge branch 'main' into dependabot/gradle/TestVectors/runtimes/java/software.amazon.awssdk-core-2.26.25
2 parents d3086a0 + abd1727 commit 5f128f7

12 files changed

+14
-14
lines changed

.github/workflows/ci_codegen.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
# and to translate version strings such as "nightly-latest"
3939
# to an actual DAFNY_VERSION.
4040
- name: Setup Dafny
41-
uses: dafny-lang/[email protected].0
41+
uses: dafny-lang/[email protected].2
4242
with:
4343
dafny-version: ${{ inputs.dafny }}
4444

.github/workflows/ci_examples_java.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
java-version: ${{ matrix.java-version }}
5454

5555
- name: Setup Dafny
56-
uses: dafny-lang/[email protected].0
56+
uses: dafny-lang/[email protected].2
5757
with:
5858
dafny-version: ${{ inputs.dafny }}
5959

.github/workflows/ci_examples_net.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
dotnet-version: ${{ matrix.dotnet-version }}
4747

4848
- name: Setup Dafny
49-
uses: dafny-lang/[email protected].0
49+
uses: dafny-lang/[email protected].2
5050
with:
5151
dafny-version: ${{ inputs.dafny }}
5252

.github/workflows/ci_test_java.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
submodules: recursive
4848

4949
- name: Setup Dafny
50-
uses: dafny-lang/[email protected].0
50+
uses: dafny-lang/[email protected].2
5151
with:
5252
dafny-version: ${{ inputs.dafny }}
5353

.github/workflows/ci_test_net.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
dotnet-version: ${{ matrix.dotnet-version }}
4848

4949
- name: Setup Dafny
50-
uses: dafny-lang/[email protected].0
50+
uses: dafny-lang/[email protected].2
5151
with:
5252
dafny-version: ${{ inputs.dafny }}
5353

.github/workflows/ci_test_vector_java.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
submodules: recursive
5757

5858
- name: Setup Dafny
59-
uses: dafny-lang/[email protected].0
59+
uses: dafny-lang/[email protected].2
6060
with:
6161
dafny-version: ${{ inputs.dafny }}
6262

.github/workflows/ci_test_vector_net.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
submodules: recursive
5353

5454
- name: Setup Dafny
55-
uses: dafny-lang/[email protected].0
55+
uses: dafny-lang/[email protected].2
5656
with:
5757
dafny-version: ${{ inputs.dafny }}
5858

.github/workflows/library_dafny_verification.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
submodules: recursive
5353

5454
- name: Setup Dafny
55-
uses: dafny-lang/[email protected].0
55+
uses: dafny-lang/[email protected].2
5656
with:
5757
dafny-version: ${{ inputs.dafny }}
5858

@@ -73,7 +73,7 @@ jobs:
7373
# dafny-reportgenerator requires next6
7474
# but only 7.0 is installed on macos-12-large
7575
- name: Setup .NET Core SDK '6.0.x'
76-
uses: actions/setup-dotnet@v3
76+
uses: actions/setup-dotnet@v4
7777
with:
7878
dotnet-version: "6.0.x"
7979

.github/workflows/library_format.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
submodules: recursive
3838

3939
- name: Setup Dafny
40-
uses: dafny-lang/[email protected].0
40+
uses: dafny-lang/[email protected].2
4141
with:
4242
dafny-version: ${{ '4.2.0' }}
4343

.github/workflows/nightly.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
steps:
7474
# We need access to the role that is able to get CI Bot Creds
7575
- name: Configure AWS Credentials for Release
76-
uses: aws-actions/configure-aws-credentials@v2
76+
uses: aws-actions/configure-aws-credentials@v4
7777
with:
7878
aws-region: us-west-2
7979
role-to-assume: arn:aws:iam::587316601012:role/GitHub-CI-CI-Bot-Credential-Access-Role-us-west-2

.github/workflows/test_vector_verification.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
submodules: recursive
4444

4545
- name: Setup Dafny
46-
uses: dafny-lang/[email protected].0
46+
uses: dafny-lang/[email protected].2
4747
with:
4848
dafny-version: ${{ inputs.dafny }}
4949

@@ -64,7 +64,7 @@ jobs:
6464
# dafny-reportgenerator requires next6
6565
# but only 7.0 is installed on macos-12-large
6666
- name: Setup .NET Core SDK '6.0.x'
67-
uses: actions/setup-dotnet@v3
67+
uses: actions/setup-dotnet@v4
6868
with:
6969
dotnet-version: "6.0.x"
7070

TestVectors/runtimes/java/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ dependencies {
9292
implementation("software.amazon.cryptography:aws-database-encryption-sdk-dynamodb:${ddbecVersion}")
9393
implementation("software.amazon.cryptography:TestAwsCryptographicMaterialProviders:${mplVersion}")
9494

95-
implementation(platform("software.amazon.awssdk:bom:2.24.2"))
95+
implementation(platform("software.amazon.awssdk:bom:2.26.25"))
9696
implementation("software.amazon.awssdk:dynamodb")
9797
implementation("software.amazon.awssdk:dynamodb-enhanced")
9898
implementation("software.amazon.awssdk:core:2.26.25")

0 commit comments

Comments
 (0)