From 73085fdf86cc692dccab5797005bf2e9d7d4d02c Mon Sep 17 00:00:00 2001 From: rishav-karanjit Date: Thu, 6 Mar 2025 11:39:06 -0800 Subject: [PATCH 1/2] remove macos --- .github/workflows/ci_examples_java.yml | 6 +++++- .github/workflows/ci_examples_net.yml | 6 +++++- .github/workflows/ci_test_java.yml | 6 +++++- .github/workflows/ci_test_net.yml | 6 +++++- .github/workflows/dafny_interop_examples_java.yml | 6 +++++- .github/workflows/dafny_interop_examples_net.yml | 6 +++++- .github/workflows/dafny_interop_java.yml | 6 +++++- .github/workflows/library_dafny_verification.yml | 6 +++++- .github/workflows/library_format.yml | 6 +++++- .github/workflows/library_rust_tests.yml | 11 ++++++++++- .github/workflows/test_vector_verification.yml | 6 +++++- 11 files changed, 60 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci_examples_java.yml b/.github/workflows/ci_examples_java.yml index d33c4fc93..7fe376f1d 100644 --- a/.github/workflows/ci_examples_java.yml +++ b/.github/workflows/ci_examples_java.yml @@ -29,7 +29,11 @@ jobs: max-parallel: 1 matrix: java-version: [8, 11, 16, 17] - os: [macos-13] + os: [ + ubuntu-22.04, + # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 + # macos-13, + ] runs-on: ${{ matrix.os }} permissions: id-token: write diff --git a/.github/workflows/ci_examples_net.yml b/.github/workflows/ci_examples_net.yml index 4e50a975b..9f5dfba0b 100644 --- a/.github/workflows/ci_examples_net.yml +++ b/.github/workflows/ci_examples_net.yml @@ -27,7 +27,11 @@ jobs: matrix: library: [DynamoDbEncryption] dotnet-version: ["6.0.x"] - os: [macos-13] + os: [ + ubuntu-22.04, + # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 + # macos-13, + ] runs-on: ${{ matrix.os }} permissions: id-token: write diff --git a/.github/workflows/ci_test_java.yml b/.github/workflows/ci_test_java.yml index 66e0bfe17..baac7b76e 100644 --- a/.github/workflows/ci_test_java.yml +++ b/.github/workflows/ci_test_java.yml @@ -29,7 +29,11 @@ jobs: matrix: library: [DynamoDbEncryption] java-version: [8, 11, 16, 17] - os: [macos-13] + os: [ + ubuntu-22.04, + # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 + # macos-13, + ] runs-on: ${{ matrix.os }} permissions: id-token: write diff --git a/.github/workflows/ci_test_net.yml b/.github/workflows/ci_test_net.yml index 9a9767262..2dcbeb5de 100644 --- a/.github/workflows/ci_test_net.yml +++ b/.github/workflows/ci_test_net.yml @@ -25,7 +25,11 @@ jobs: matrix: library: [DynamoDbEncryption] dotnet-version: ["6.0.x"] - os: [macos-13, ubuntu-latest, windows-latest] + os: [ + # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 + # macos-13, + ubuntu-latest, + windows-latest] runs-on: ${{ matrix.os }} permissions: id-token: write diff --git a/.github/workflows/dafny_interop_examples_java.yml b/.github/workflows/dafny_interop_examples_java.yml index 3c1d7a944..47252ddff 100644 --- a/.github/workflows/dafny_interop_examples_java.yml +++ b/.github/workflows/dafny_interop_examples_java.yml @@ -28,7 +28,11 @@ jobs: max-parallel: 1 matrix: java-version: [8, 11, 16, 17] - os: [macos-13] + os: [ + # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 + # macos-13, + ubuntu-latest, + ] runs-on: ${{ matrix.os }} permissions: id-token: write diff --git a/.github/workflows/dafny_interop_examples_net.yml b/.github/workflows/dafny_interop_examples_net.yml index dad02aac5..f1c3d1bcc 100644 --- a/.github/workflows/dafny_interop_examples_net.yml +++ b/.github/workflows/dafny_interop_examples_net.yml @@ -24,7 +24,11 @@ jobs: matrix: library: [DynamoDbEncryption] dotnet-version: ["6.0.x"] - os: [macos-13] + os: [ + # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 + # macos-13, + ubuntu-latest, + ] runs-on: ${{ matrix.os }} permissions: id-token: write diff --git a/.github/workflows/dafny_interop_java.yml b/.github/workflows/dafny_interop_java.yml index a1b049a12..04d1b1a39 100644 --- a/.github/workflows/dafny_interop_java.yml +++ b/.github/workflows/dafny_interop_java.yml @@ -28,7 +28,11 @@ jobs: matrix: library: [DynamoDbEncryption] java-version: [8, 11, 16, 17] - os: [macos-13] + os: [ + # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 + # macos-13, + ubuntu-latest, + ] runs-on: ${{ matrix.os }} permissions: id-token: write diff --git a/.github/workflows/library_dafny_verification.yml b/.github/workflows/library_dafny_verification.yml index 21f25c39f..0dd90b1df 100644 --- a/.github/workflows/library_dafny_verification.yml +++ b/.github/workflows/library_dafny_verification.yml @@ -39,7 +39,11 @@ jobs: DynamoDbItemEncryptor, StructuredEncryption, ] - os: [macos-13] + os: [ + # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 + # macos-13, + ubuntu-latest, + ] runs-on: ${{ matrix.os }} defaults: run: diff --git a/.github/workflows/library_format.yml b/.github/workflows/library_format.yml index fa37e073a..93618cddd 100644 --- a/.github/workflows/library_format.yml +++ b/.github/workflows/library_format.yml @@ -19,7 +19,11 @@ jobs: if: github.event_name != 'schedule' || github.repository_owner == 'aws' strategy: matrix: - os: [macos-13] + os: [ + # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 + # macos-13, + ubuntu-latest, + ] runs-on: ${{ matrix.os }} defaults: run: diff --git a/.github/workflows/library_rust_tests.yml b/.github/workflows/library_rust_tests.yml index b355e4572..ed8610f3b 100644 --- a/.github/workflows/library_rust_tests.yml +++ b/.github/workflows/library_rust_tests.yml @@ -26,7 +26,16 @@ jobs: matrix: library: [DynamoDbEncryption, TestVectors] # removed windows-latest because somehow it can't build aws-lc in CI - os: [ubuntu-latest, macos-13] + os: [ + # TODO fix Dafny-generated tests on Windows; + # the sys.path workaround for generated Dafny doesn't work on Windows. + # Note: only tests use the sys.path workaround, not source code. + # Windows source code is tested downstream (ex. ESDK-Python CI). + # windows-latest, + ubuntu-22.04, + # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 + # macos-13, + ] runs-on: ${{ matrix.os }} permissions: id-token: write diff --git a/.github/workflows/test_vector_verification.yml b/.github/workflows/test_vector_verification.yml index 6d0fad611..77b1efb00 100644 --- a/.github/workflows/test_vector_verification.yml +++ b/.github/workflows/test_vector_verification.yml @@ -29,7 +29,11 @@ jobs: if: github.event_name != 'schedule' || github.repository_owner == 'aws' strategy: matrix: - os: [macos-13] + os: [ + # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 + # macos-13, + ubuntu-latest, + ] runs-on: ${{ matrix.os }} defaults: run: From 5022dc3f1a25461ef7cef2e9424602b9b6e2c419 Mon Sep 17 00:00:00 2001 From: rishav-karanjit Date: Fri, 7 Mar 2025 11:05:54 -0800 Subject: [PATCH 2/2] formatting --- .github/workflows/ci_examples_java.yml | 8 ++++---- .github/workflows/ci_examples_net.yml | 8 ++++---- .github/workflows/ci_test_java.yml | 8 ++++---- .github/workflows/ci_test_net.yml | 9 +++++---- .github/workflows/dafny_interop_examples_java.yml | 8 ++++---- .github/workflows/dafny_interop_examples_net.yml | 8 ++++---- .github/workflows/dafny_interop_java.yml | 8 ++++---- .github/workflows/library_dafny_verification.yml | 8 ++++---- .github/workflows/library_format.yml | 8 ++++---- .github/workflows/library_rust_tests.yml | 2 +- .github/workflows/test_vector_verification.yml | 8 ++++---- 11 files changed, 42 insertions(+), 41 deletions(-) diff --git a/.github/workflows/ci_examples_java.yml b/.github/workflows/ci_examples_java.yml index 7fe376f1d..2442416e7 100644 --- a/.github/workflows/ci_examples_java.yml +++ b/.github/workflows/ci_examples_java.yml @@ -30,10 +30,10 @@ jobs: matrix: java-version: [8, 11, 16, 17] os: [ - ubuntu-22.04, - # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 - # macos-13, - ] + ubuntu-22.04, + # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 + # macos-13, + ] runs-on: ${{ matrix.os }} permissions: id-token: write diff --git a/.github/workflows/ci_examples_net.yml b/.github/workflows/ci_examples_net.yml index 9f5dfba0b..71d79307f 100644 --- a/.github/workflows/ci_examples_net.yml +++ b/.github/workflows/ci_examples_net.yml @@ -28,10 +28,10 @@ jobs: library: [DynamoDbEncryption] dotnet-version: ["6.0.x"] os: [ - ubuntu-22.04, - # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 - # macos-13, - ] + ubuntu-22.04, + # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 + # macos-13, + ] runs-on: ${{ matrix.os }} permissions: id-token: write diff --git a/.github/workflows/ci_test_java.yml b/.github/workflows/ci_test_java.yml index baac7b76e..f4f2b3d0e 100644 --- a/.github/workflows/ci_test_java.yml +++ b/.github/workflows/ci_test_java.yml @@ -30,10 +30,10 @@ jobs: library: [DynamoDbEncryption] java-version: [8, 11, 16, 17] os: [ - ubuntu-22.04, - # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 - # macos-13, - ] + ubuntu-22.04, + # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 + # macos-13, + ] runs-on: ${{ matrix.os }} permissions: id-token: write diff --git a/.github/workflows/ci_test_net.yml b/.github/workflows/ci_test_net.yml index 2dcbeb5de..51b22498a 100644 --- a/.github/workflows/ci_test_net.yml +++ b/.github/workflows/ci_test_net.yml @@ -26,10 +26,11 @@ jobs: library: [DynamoDbEncryption] dotnet-version: ["6.0.x"] os: [ - # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 - # macos-13, - ubuntu-latest, - windows-latest] + # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 + # macos-13, + ubuntu-latest, + windows-latest, + ] runs-on: ${{ matrix.os }} permissions: id-token: write diff --git a/.github/workflows/dafny_interop_examples_java.yml b/.github/workflows/dafny_interop_examples_java.yml index 47252ddff..f810911ce 100644 --- a/.github/workflows/dafny_interop_examples_java.yml +++ b/.github/workflows/dafny_interop_examples_java.yml @@ -29,10 +29,10 @@ jobs: matrix: java-version: [8, 11, 16, 17] os: [ - # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 - # macos-13, - ubuntu-latest, - ] + # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 + # macos-13, + ubuntu-latest, + ] runs-on: ${{ matrix.os }} permissions: id-token: write diff --git a/.github/workflows/dafny_interop_examples_net.yml b/.github/workflows/dafny_interop_examples_net.yml index f1c3d1bcc..ddd227686 100644 --- a/.github/workflows/dafny_interop_examples_net.yml +++ b/.github/workflows/dafny_interop_examples_net.yml @@ -25,10 +25,10 @@ jobs: library: [DynamoDbEncryption] dotnet-version: ["6.0.x"] os: [ - # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 - # macos-13, - ubuntu-latest, - ] + # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 + # macos-13, + ubuntu-latest, + ] runs-on: ${{ matrix.os }} permissions: id-token: write diff --git a/.github/workflows/dafny_interop_java.yml b/.github/workflows/dafny_interop_java.yml index 04d1b1a39..a66bed8fa 100644 --- a/.github/workflows/dafny_interop_java.yml +++ b/.github/workflows/dafny_interop_java.yml @@ -29,10 +29,10 @@ jobs: library: [DynamoDbEncryption] java-version: [8, 11, 16, 17] os: [ - # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 - # macos-13, - ubuntu-latest, - ] + # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 + # macos-13, + ubuntu-latest, + ] runs-on: ${{ matrix.os }} permissions: id-token: write diff --git a/.github/workflows/library_dafny_verification.yml b/.github/workflows/library_dafny_verification.yml index 0dd90b1df..559af2cae 100644 --- a/.github/workflows/library_dafny_verification.yml +++ b/.github/workflows/library_dafny_verification.yml @@ -40,10 +40,10 @@ jobs: StructuredEncryption, ] os: [ - # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 - # macos-13, - ubuntu-latest, - ] + # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 + # macos-13, + ubuntu-latest, + ] runs-on: ${{ matrix.os }} defaults: run: diff --git a/.github/workflows/library_format.yml b/.github/workflows/library_format.yml index 93618cddd..f270eea59 100644 --- a/.github/workflows/library_format.yml +++ b/.github/workflows/library_format.yml @@ -20,10 +20,10 @@ jobs: strategy: matrix: os: [ - # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 - # macos-13, - ubuntu-latest, - ] + # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 + # macos-13, + ubuntu-latest, + ] runs-on: ${{ matrix.os }} defaults: run: diff --git a/.github/workflows/library_rust_tests.yml b/.github/workflows/library_rust_tests.yml index ed8610f3b..9e44681ae 100644 --- a/.github/workflows/library_rust_tests.yml +++ b/.github/workflows/library_rust_tests.yml @@ -34,7 +34,7 @@ jobs: # windows-latest, ubuntu-22.04, # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 - # macos-13, + # macos-13, ] runs-on: ${{ matrix.os }} permissions: diff --git a/.github/workflows/test_vector_verification.yml b/.github/workflows/test_vector_verification.yml index 77b1efb00..421a1106d 100644 --- a/.github/workflows/test_vector_verification.yml +++ b/.github/workflows/test_vector_verification.yml @@ -30,10 +30,10 @@ jobs: strategy: matrix: os: [ - # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 - # macos-13, - ubuntu-latest, - ] + # TODO: Re-enable macOS after https://t.corp.amazon.com/P205755286 + # macos-13, + ubuntu-latest, + ] runs-on: ${{ matrix.os }} defaults: run: