From 3f74e3762f4fecf4a01890117e6d10c991585595 Mon Sep 17 00:00:00 2001 From: Andy Jewell Date: Mon, 4 Nov 2024 13:30:30 -0500 Subject: [PATCH 1/2] chore: bump macos from 12 to 13 in CI --- .github/workflows/dafny_interop_test_net.yml | 2 +- .github/workflows/dafny_interop_test_vector_net.yml | 6 +++--- .github/workflows/library_dafny_verification.yml | 2 +- .github/workflows/library_interop_tests.yml | 6 +++--- .github/workflows/library_java_tests.yml | 2 +- .github/workflows/library_net_tests.yml | 2 +- .github/workflows/sem_ver.yml | 2 +- .github/workflows/semantic_release.yml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/dafny_interop_test_net.yml b/.github/workflows/dafny_interop_test_net.yml index fd56e893e..d7c83596f 100644 --- a/.github/workflows/dafny_interop_test_net.yml +++ b/.github/workflows/dafny_interop_test_net.yml @@ -37,7 +37,7 @@ jobs: os: [ windows-latest, ubuntu-latest, - macos-12, + macos-13, ] runs-on: ${{ matrix.os }} permissions: diff --git a/.github/workflows/dafny_interop_test_vector_net.yml b/.github/workflows/dafny_interop_test_vector_net.yml index 2940a1a67..e7009fa35 100644 --- a/.github/workflows/dafny_interop_test_vector_net.yml +++ b/.github/workflows/dafny_interop_test_vector_net.yml @@ -36,7 +36,7 @@ jobs: os: [ windows-latest, ubuntu-latest, - macos-12, + macos-13, ] runs-on: ${{matrix.os}} permissions: @@ -146,7 +146,7 @@ jobs: matrix: os: [ ubuntu-latest, - macos-12, + macos-13, ] runs-on: ${{ matrix.os }} permissions: @@ -251,7 +251,7 @@ jobs: matrix: os: [ ubuntu-latest, - macos-12, + macos-13, ] runs-on: ${{ matrix.os }} permissions: diff --git a/.github/workflows/library_dafny_verification.yml b/.github/workflows/library_dafny_verification.yml index f36a30347..96cc35d77 100644 --- a/.github/workflows/library_dafny_verification.yml +++ b/.github/workflows/library_dafny_verification.yml @@ -21,7 +21,7 @@ jobs: library: [ AwsEncryptionSDK ] - os: [ macos-12 ] + os: [ macos-13 ] runs-on: ${{ matrix.os }} env: DOTNET_CLI_TELEMETRY_OPTOUT: 1 diff --git a/.github/workflows/library_interop_tests.yml b/.github/workflows/library_interop_tests.yml index 112b6825a..8af6a9462 100644 --- a/.github/workflows/library_interop_tests.yml +++ b/.github/workflows/library_interop_tests.yml @@ -27,7 +27,7 @@ jobs: os: [ windows-latest, ubuntu-latest, - macos-12, + macos-13, ] runs-on: ${{ matrix.os }} permissions: @@ -125,7 +125,7 @@ jobs: matrix: os: [ ubuntu-latest, - macos-12, + macos-13, ] runs-on: ${{ matrix.os }} permissions: @@ -230,7 +230,7 @@ jobs: matrix: os: [ ubuntu-latest, - macos-12, + macos-13, ] runs-on: ${{ matrix.os }} permissions: diff --git a/.github/workflows/library_java_tests.yml b/.github/workflows/library_java_tests.yml index 101a6223a..2893d3d4f 100644 --- a/.github/workflows/library_java_tests.yml +++ b/.github/workflows/library_java_tests.yml @@ -25,7 +25,7 @@ jobs: # TODO just test on mac for now #windows-latest, #ubuntu-latest, - macos-12 + macos-13 ] runs-on: ${{ matrix.os }} permissions: diff --git a/.github/workflows/library_net_tests.yml b/.github/workflows/library_net_tests.yml index 910f5200f..ab0ec1788 100644 --- a/.github/workflows/library_net_tests.yml +++ b/.github/workflows/library_net_tests.yml @@ -33,7 +33,7 @@ jobs: os: [ windows-latest, ubuntu-latest, - macos-12, + macos-13, ] runs-on: ${{ matrix.os }} permissions: diff --git a/.github/workflows/sem_ver.yml b/.github/workflows/sem_ver.yml index 1acf295f9..eb2752675 100644 --- a/.github/workflows/sem_ver.yml +++ b/.github/workflows/sem_ver.yml @@ -6,7 +6,7 @@ on: jobs: semantic-release: - runs-on: macos-12 + runs-on: macos-13 permissions: id-token: write contents: read diff --git a/.github/workflows/semantic_release.yml b/.github/workflows/semantic_release.yml index 5fb0fd0f6..2e8455220 100644 --- a/.github/workflows/semantic_release.yml +++ b/.github/workflows/semantic_release.yml @@ -15,7 +15,7 @@ jobs: # privileged operation, so we must make sure this list of users is a subset of the users labeled as maintainers of # https://github.com/orgs/aws/teams/aws-crypto-tools if: contains('["seebees","texastony","ShubhamChaturvedi7","lucasmcdonald3","josecorella","imabhichow","rishav-karanjit","antonf-amzn","justplaz","ajewellamz","RitvikKapila"]', github.actor) - runs-on: macos-12 + runs-on: macos-13 permissions: id-token: write contents: write From 0f167e2a7aaf76821798ed72e0ebef0d43c29835 Mon Sep 17 00:00:00 2001 From: Andy Jewell Date: Mon, 4 Nov 2024 15:16:19 -0500 Subject: [PATCH 2/2] dotnet 6 --- .github/workflows/library_dafny_verification.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/library_dafny_verification.yml b/.github/workflows/library_dafny_verification.yml index 96cc35d77..8219129df 100644 --- a/.github/workflows/library_dafny_verification.yml +++ b/.github/workflows/library_dafny_verification.yml @@ -38,6 +38,13 @@ jobs: git submodule update --init --recursive mpl git submodule update --init smithy-dafny + # dafny-reportgenerator requires next6 + # but only 7.0 is installed on macos-13-large + - name: Setup .NET Core SDK '6.0.x' + uses: actions/setup-dotnet@v3 + with: + dotnet-version: "6.0.x" + - name: Setup Dafny uses: dafny-lang/setup-dafny-action@v1.7.0 with: