Skip to content

Commit aee3337

Browse files
Merge branch 'main' into DDBv2_Upgrade
2 parents e8ec247 + 1abb2dd commit aee3337

15 files changed

+18
-18
lines changed

.github/workflows/check-files.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
env:
1515
# unfortunately we can't check if the approver is part of the CODEOWNERS. This is a subset of aws/aws-crypto-tools-team
1616
# to add more allowlisted approvers just modify this env variable
17-
maintainers: seebees, texastony, ShubhamChaturvedi7, lucasmcdonald3, josecorella, imabhichow, rishav-karanjit, antonf-amzn, justplaz, ajewellamz
17+
maintainers: seebees, texastony, ShubhamChaturvedi7, lucasmcdonald3, josecorella, imabhichow, rishav-karanjit, antonf-amzn, kessplas, ajewellamz, RitvikKapila
1818
steps:
1919
- uses: actions/checkout@v3
2020
with:

.github/workflows/ci_examples_java.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
max-parallel: 1
3030
matrix:
3131
java-version: [8, 11, 16, 17]
32-
os: [macos-12]
32+
os: [macos-13]
3333
runs-on: ${{ matrix.os }}
3434
permissions:
3535
id-token: write

.github/workflows/ci_examples_net.yml

+1-1
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-12]
30+
os: [macos-13]
3131
runs-on: ${{ matrix.os }}
3232
permissions:
3333
id-token: write

.github/workflows/ci_test_java.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
matrix:
3030
library: [DynamoDbEncryption]
3131
java-version: [8, 11, 16, 17]
32-
os: [macos-12]
32+
os: [macos-13]
3333
runs-on: ${{ matrix.os }}
3434
permissions:
3535
id-token: write

.github/workflows/ci_test_net.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
matrix:
2626
library: [DynamoDbEncryption]
2727
dotnet-version: ["6.0.x"]
28-
os: [macos-12, ubuntu-latest, windows-latest]
28+
os: [macos-13, ubuntu-latest, windows-latest]
2929
runs-on: ${{ matrix.os }}
3030
permissions:
3131
id-token: write

.github/workflows/ci_todos.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
jobs:
1111
findTodos:
12-
runs-on: macos-12
12+
runs-on: macos-13
1313
steps:
1414
- uses: actions/checkout@v3
1515

.github/workflows/dafny_interop_examples_java.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
max-parallel: 1
2929
matrix:
3030
java-version: [8, 11, 16, 17]
31-
os: [macos-12]
31+
os: [macos-13]
3232
runs-on: ${{ matrix.os }}
3333
permissions:
3434
id-token: write

.github/workflows/dafny_interop_examples_net.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
matrix:
2525
library: [DynamoDbEncryption]
2626
dotnet-version: ["6.0.x"]
27-
os: [macos-12]
27+
os: [macos-13]
2828
runs-on: ${{ matrix.os }}
2929
permissions:
3030
id-token: write

.github/workflows/dafny_interop_java.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
matrix:
2929
library: [DynamoDbEncryption]
3030
java-version: [8, 11, 16, 17]
31-
os: [macos-12]
31+
os: [macos-13]
3232
runs-on: ${{ matrix.os }}
3333
permissions:
3434
id-token: write

.github/workflows/dafny_interop_test_net.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
matrix:
2525
library: [DynamoDbEncryption]
2626
dotnet-version: ["6.0.x"]
27-
os: [macos-12, ubuntu-latest, windows-latest]
27+
os: [macos-13, ubuntu-latest, windows-latest]
2828
runs-on: ${{ matrix.os }}
2929
permissions:
3030
id-token: write

.github/workflows/library_dafny_verification.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
DynamoDbItemEncryptor,
4040
StructuredEncryption,
4141
]
42-
os: [macos-12]
42+
os: [macos-13]
4343
runs-on: ${{ matrix.os }}
4444
defaults:
4545
run:
@@ -72,7 +72,7 @@ jobs:
7272
sed "s/mplDependencyJavaVersion=.*/mplDependencyJavaVersion=${{inputs.mpl-version}}/g" project.properties > project.properties2; mv project.properties2 project.properties
7373
7474
# dafny-reportgenerator requires next6
75-
# but only 7.0 is installed on macos-12-large
75+
# but only 7.0 is installed on macos-13-large
7676
- name: Setup .NET Core SDK '6.0.x'
7777
uses: actions/setup-dotnet@v4
7878
with:

.github/workflows/library_format.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
if: github.event_name != 'schedule' || github.repository_owner == 'aws'
2020
strategy:
2121
matrix:
22-
os: [macos-12]
22+
os: [macos-13]
2323
runs-on: ${{ matrix.os }}
2424
defaults:
2525
run:

.github/workflows/sem_ver.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
jobs:
88
semantic-release:
9-
runs-on: macos-12
9+
runs-on: macos-13
1010
permissions:
1111
id-token: write
1212
contents: read

.github/workflows/semantic_release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
# there is no easy way in gha to check if the actor is part of the team, running semantic release is a more
1515
# privileged operation, so we must make sure this list of users is a subset of the users labeled as maintainers of
1616
# https://github.com/orgs/aws/teams/aws-crypto-tools
17-
if: contains('["seebees","texastony","ShubhamChaturvedi7","lucasmcdonald3","josecorella","imabhichow","rishav-karanjit","antonf-amzn","justplaz","ajewellamz","RitvikKapila"]', github.actor)
18-
runs-on: macos-12
17+
if: contains('["seebees","texastony","ShubhamChaturvedi7","lucasmcdonald3","josecorella","imabhichow","rishav-karanjit","antonf-amzn","kessplas","ajewellamz","RitvikKapila"]', github.actor)
18+
runs-on: macos-13
1919
permissions:
2020
id-token: write
2121
contents: write

.github/workflows/test_vector_verification.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
if: github.event_name != 'schedule' || github.repository_owner == 'aws'
3030
strategy:
3131
matrix:
32-
os: [macos-12]
32+
os: [macos-13]
3333
runs-on: ${{ matrix.os }}
3434
defaults:
3535
run:
@@ -62,7 +62,7 @@ jobs:
6262
sed "s/mplDependencyJavaVersion=.*/mplDependencyJavaVersion=${{inputs.mpl-version}}/g" project.properties > project.properties2; mv project.properties2 project.properties
6363
6464
# dafny-reportgenerator requires next6
65-
# but only 7.0 is installed on macos-12-large
65+
# but only 7.0 is installed on macos-13-large
6666
- name: Setup .NET Core SDK '6.0.x'
6767
uses: actions/setup-dotnet@v4
6868
with:

0 commit comments

Comments
 (0)