From 4c709d9114ddfbba4c260b4fef3f00d756c6a1a9 Mon Sep 17 00:00:00 2001 From: seebees Date: Wed, 19 Mar 2025 12:50:07 -0700 Subject: [PATCH 1/4] chore: re-enable Dafny for MacOS .NET had a signature failure in MacOS. This was fixed in 9.0.202. This installs at least this version of .NET to make the setup-dafny-action succeed. --- .github/actions/setup_dafny/action.yml | 29 +++++++++++++++++++ .github/workflows/ci_codegen.yml | 2 +- .github/workflows/ci_examples_java.yml | 2 +- .github/workflows/ci_examples_net.yml | 2 +- .github/workflows/ci_test_java.yml | 2 +- .../ci_test_latest_released_mpl_java.yml | 2 +- .github/workflows/ci_test_net.yml | 2 +- .github/workflows/ci_test_vector_java.yml | 2 +- .github/workflows/ci_test_vector_net.yml | 2 +- .../workflows/dafny_interop_examples_java.yml | 4 +-- .../workflows/dafny_interop_examples_net.yml | 4 +-- .github/workflows/dafny_interop_java.yml | 4 +-- .github/workflows/dafny_interop_test_net.yml | 4 +-- .../dafny_interop_test_vector_java.yml | 4 +-- .../dafny_interop_test_vector_net.yml | 4 +-- .../workflows/library_dafny_verification.yml | 2 +- .github/workflows/library_format.yml | 2 +- .github/workflows/library_rust_tests.yml | 2 +- .../workflows/test_vector_verification.yml | 2 +- 19 files changed, 53 insertions(+), 24 deletions(-) create mode 100644 .github/actions/setup_dafny/action.yml diff --git a/.github/actions/setup_dafny/action.yml b/.github/actions/setup_dafny/action.yml new file mode 100644 index 000000000..8991a5b0b --- /dev/null +++ b/.github/actions/setup_dafny/action.yml @@ -0,0 +1,29 @@ +# +# +# This local action consolidate all uses of dafny-lang/setup-dafny-action +# Once the MPL is updated, this action can point to the MPL version. +# +name: "Setup Dafny" +description: "This uses the setup Dafny action." +inputs: + dafny-version: + description: "The Dafny version to setup" + required: true + type: string +runs: + using: "composite" + steps: + # The dotnet tool requires >= 9.0.202 to work on MacOS + # See: https://github.com/dotnet/sdk/issues/46857#issuecomment-2734338347 + # Ideally this action would only install this on MacOS, + # but I do not want to keep track of the various values + # See: https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/store-information-in-variables#detecting-the-operating-system + - name: Setup .NET Core SDK '9.0.x' + uses: actions/setup-dotnet@v3 + with: + dotnet-version: "9.0.x" + + - name: Setup Dafny with setup-dafny action + uses: dafny-lang/setup-dafny-action@v1.8.0 + with: + dafny-version: ${{ inputs.dafny-version }} diff --git a/.github/workflows/ci_codegen.yml b/.github/workflows/ci_codegen.yml index b6acbb18e..5ee3bd5af 100644 --- a/.github/workflows/ci_codegen.yml +++ b/.github/workflows/ci_codegen.yml @@ -39,7 +39,7 @@ jobs: # and to translate version strings such as "nightly-latest" # to an actual DAFNY_VERSION. - name: Setup Dafny - uses: dafny-lang/setup-dafny-action@v1.8.0 + uses: ./.github/actions/setup_dafny with: dafny-version: ${{ inputs.dafny }} diff --git a/.github/workflows/ci_examples_java.yml b/.github/workflows/ci_examples_java.yml index d33c4fc93..b3016085d 100644 --- a/.github/workflows/ci_examples_java.yml +++ b/.github/workflows/ci_examples_java.yml @@ -53,7 +53,7 @@ jobs: java-version: ${{ matrix.java-version }} - name: Setup Dafny - uses: dafny-lang/setup-dafny-action@v1.8.0 + uses: ./.github/actions/setup_dafny with: dafny-version: ${{ inputs.dafny }} diff --git a/.github/workflows/ci_examples_net.yml b/.github/workflows/ci_examples_net.yml index 4e50a975b..ca684926e 100644 --- a/.github/workflows/ci_examples_net.yml +++ b/.github/workflows/ci_examples_net.yml @@ -46,7 +46,7 @@ jobs: dotnet-version: ${{ matrix.dotnet-version }} - name: Setup Dafny - uses: dafny-lang/setup-dafny-action@v1.8.0 + uses: ./.github/actions/setup_dafny with: dafny-version: ${{ inputs.dafny }} diff --git a/.github/workflows/ci_test_java.yml b/.github/workflows/ci_test_java.yml index 66e0bfe17..91b962abf 100644 --- a/.github/workflows/ci_test_java.yml +++ b/.github/workflows/ci_test_java.yml @@ -47,7 +47,7 @@ jobs: submodules: recursive - name: Setup Dafny - uses: dafny-lang/setup-dafny-action@v1.8.0 + uses: ./.github/actions/setup_dafny with: dafny-version: ${{ inputs.dafny }} diff --git a/.github/workflows/ci_test_latest_released_mpl_java.yml b/.github/workflows/ci_test_latest_released_mpl_java.yml index 30a4fd030..56d0bd998 100644 --- a/.github/workflows/ci_test_latest_released_mpl_java.yml +++ b/.github/workflows/ci_test_latest_released_mpl_java.yml @@ -54,7 +54,7 @@ jobs: java-version: ${{ matrix.java-version }} - name: Setup Dafny - uses: dafny-lang/setup-dafny-action@v1.8.0 + uses: ./.github/actions/setup_dafny with: dafny-version: ${{ needs.getVersion.outputs.version }} diff --git a/.github/workflows/ci_test_net.yml b/.github/workflows/ci_test_net.yml index f8e6f7dec..a1f291aa9 100644 --- a/.github/workflows/ci_test_net.yml +++ b/.github/workflows/ci_test_net.yml @@ -47,7 +47,7 @@ jobs: dotnet-version: ${{ matrix.dotnet-version }} - name: Setup Dafny - uses: dafny-lang/setup-dafny-action@v1.8.0 + uses: ./.github/actions/setup_dafny with: dafny-version: ${{ inputs.dafny }} diff --git a/.github/workflows/ci_test_vector_java.yml b/.github/workflows/ci_test_vector_java.yml index 5c6fee636..a82075641 100644 --- a/.github/workflows/ci_test_vector_java.yml +++ b/.github/workflows/ci_test_vector_java.yml @@ -56,7 +56,7 @@ jobs: submodules: recursive - name: Setup Dafny - uses: dafny-lang/setup-dafny-action@v1.8.0 + uses: ./.github/actions/setup_dafny with: dafny-version: ${{ inputs.dafny }} diff --git a/.github/workflows/ci_test_vector_net.yml b/.github/workflows/ci_test_vector_net.yml index 2b53789e3..8c266ae58 100644 --- a/.github/workflows/ci_test_vector_net.yml +++ b/.github/workflows/ci_test_vector_net.yml @@ -52,7 +52,7 @@ jobs: submodules: recursive - name: Setup Dafny - uses: dafny-lang/setup-dafny-action@v1.8.0 + uses: ./.github/actions/setup_dafny with: dafny-version: ${{ inputs.dafny }} diff --git a/.github/workflows/dafny_interop_examples_java.yml b/.github/workflows/dafny_interop_examples_java.yml index 09cbddf1d..9156664b7 100644 --- a/.github/workflows/dafny_interop_examples_java.yml +++ b/.github/workflows/dafny_interop_examples_java.yml @@ -47,7 +47,7 @@ jobs: fetch-depth: 0 - name: Setup MPL Dafny - uses: dafny-lang/setup-dafny-action@v1.8.0 + uses: ./.github/actions/setup_dafny with: dafny-version: ${{ inputs.mpl-dafny }} @@ -73,7 +73,7 @@ jobs: make build_java CORES=$CORES - name: Setup DBESDK Dafny - uses: dafny-lang/setup-dafny-action@v1.8.0 + uses: ./.github/actions/setup_dafny with: dafny-version: ${{ inputs.dbesdk-dafny}} diff --git a/.github/workflows/dafny_interop_examples_net.yml b/.github/workflows/dafny_interop_examples_net.yml index 7698ec173..a2a5b739d 100644 --- a/.github/workflows/dafny_interop_examples_net.yml +++ b/.github/workflows/dafny_interop_examples_net.yml @@ -47,7 +47,7 @@ jobs: dotnet-version: ${{ matrix.dotnet-version }} - name: Setup MPL Dafny - uses: dafny-lang/setup-dafny-action@v1.8.0 + uses: ./.github/actions/setup_dafny with: dafny-version: ${{ inputs.mpl-dafny }} @@ -80,7 +80,7 @@ jobs: make transpile_net CORES=$CORES - name: Setup DBESDK Dafny - uses: dafny-lang/setup-dafny-action@v1.8.0 + uses: ./.github/actions/setup_dafny with: dafny-version: ${{ inputs.dbesdk-dafny}} diff --git a/.github/workflows/dafny_interop_java.yml b/.github/workflows/dafny_interop_java.yml index b5147c8c4..5621c0d3b 100644 --- a/.github/workflows/dafny_interop_java.yml +++ b/.github/workflows/dafny_interop_java.yml @@ -47,7 +47,7 @@ jobs: fetch-depth: 0 - name: Setup MPL Dafny - uses: dafny-lang/setup-dafny-action@v1.8.0 + uses: ./.github/actions/setup_dafny with: dafny-version: ${{ inputs.mpl-dafny }} @@ -73,7 +73,7 @@ jobs: make build_java CORES=$CORES - name: Setup DBESDK Dafny - uses: dafny-lang/setup-dafny-action@v1.8.0 + uses: ./.github/actions/setup_dafny with: dafny-version: ${{ inputs.dbesdk-dafny}} diff --git a/.github/workflows/dafny_interop_test_net.yml b/.github/workflows/dafny_interop_test_net.yml index 62f4c66e8..9816993d0 100644 --- a/.github/workflows/dafny_interop_test_net.yml +++ b/.github/workflows/dafny_interop_test_net.yml @@ -47,7 +47,7 @@ jobs: dotnet-version: ${{ matrix.dotnet-version }} - name: Setup MPL Dafny - uses: dafny-lang/setup-dafny-action@v1.8.0 + uses: ./.github/actions/setup_dafny with: dafny-version: ${{ inputs.mpl-dafny }} @@ -80,7 +80,7 @@ jobs: make transpile_net CORES=$CORES - name: Setup DBESDK Dafny - uses: dafny-lang/setup-dafny-action@v1.8.0 + uses: ./.github/actions/setup_dafny with: dafny-version: ${{ inputs.dbesdk-dafny}} diff --git a/.github/workflows/dafny_interop_test_vector_java.yml b/.github/workflows/dafny_interop_test_vector_java.yml index 83ae69036..f5b325b93 100644 --- a/.github/workflows/dafny_interop_test_vector_java.yml +++ b/.github/workflows/dafny_interop_test_vector_java.yml @@ -56,7 +56,7 @@ jobs: fetch-depth: 0 - name: Setup MPL Dafny - uses: dafny-lang/setup-dafny-action@v1.8.0 + uses: ./.github/actions/setup_dafny with: dafny-version: ${{ inputs.mpl-dafny }} @@ -83,7 +83,7 @@ jobs: make mvn_local_deploy - name: Setup DBESDK Dafny - uses: dafny-lang/setup-dafny-action@v1.8.0 + uses: ./.github/actions/setup_dafny with: dafny-version: ${{ inputs.dbesdk-dafny}} diff --git a/.github/workflows/dafny_interop_test_vector_net.yml b/.github/workflows/dafny_interop_test_vector_net.yml index fc32e5c4c..373434c9a 100644 --- a/.github/workflows/dafny_interop_test_vector_net.yml +++ b/.github/workflows/dafny_interop_test_vector_net.yml @@ -52,7 +52,7 @@ jobs: dotnet-version: ${{ matrix.dotnet-version }} - name: Setup MPL Dafny - uses: dafny-lang/setup-dafny-action@v1.8.0 + uses: ./.github/actions/setup_dafny with: dafny-version: ${{ inputs.mpl-dafny }} @@ -85,7 +85,7 @@ jobs: make transpile_net CORES=$CORES - name: Setup DBESDK Dafny - uses: dafny-lang/setup-dafny-action@v1.8.0 + uses: ./.github/actions/setup_dafny with: dafny-version: ${{ inputs.dbesdk-dafny}} diff --git a/.github/workflows/library_dafny_verification.yml b/.github/workflows/library_dafny_verification.yml index 21f25c39f..d88804669 100644 --- a/.github/workflows/library_dafny_verification.yml +++ b/.github/workflows/library_dafny_verification.yml @@ -53,7 +53,7 @@ jobs: submodules: recursive - name: Setup Dafny - uses: dafny-lang/setup-dafny-action@v1.8.0 + uses: ./.github/actions/setup_dafny with: dafny-version: ${{ inputs.dafny }} diff --git a/.github/workflows/library_format.yml b/.github/workflows/library_format.yml index fa37e073a..cdb80b1be 100644 --- a/.github/workflows/library_format.yml +++ b/.github/workflows/library_format.yml @@ -37,7 +37,7 @@ jobs: submodules: recursive - name: Setup Dafny - uses: dafny-lang/setup-dafny-action@v1.8.0 + uses: ./.github/actions/setup_dafny with: dafny-version: ${{ inputs.dafny }} diff --git a/.github/workflows/library_rust_tests.yml b/.github/workflows/library_rust_tests.yml index 3d75df2a2..0bbcb0848 100644 --- a/.github/workflows/library_rust_tests.yml +++ b/.github/workflows/library_rust_tests.yml @@ -68,7 +68,7 @@ jobs: components: rustfmt - name: Setup Dafny - uses: dafny-lang/setup-dafny-action@v1.8.0 + uses: ./.github/actions/setup_dafny with: dafny-version: nightly-2025-01-30-7db1e5f diff --git a/.github/workflows/test_vector_verification.yml b/.github/workflows/test_vector_verification.yml index 6d0fad611..47b6eed34 100644 --- a/.github/workflows/test_vector_verification.yml +++ b/.github/workflows/test_vector_verification.yml @@ -43,7 +43,7 @@ jobs: submodules: recursive - name: Setup Dafny - uses: dafny-lang/setup-dafny-action@v1.8.0 + uses: ./.github/actions/setup_dafny with: dafny-version: ${{ inputs.dafny }} From 505ccfdba6727980a036c56b1c1bd51cd89b48b5 Mon Sep 17 00:00:00 2001 From: seebees Date: Wed, 19 Mar 2025 13:57:40 -0700 Subject: [PATCH 2/4] update to latest MPL --- submodules/MaterialProviders | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/MaterialProviders b/submodules/MaterialProviders index 70e580991..aa2bed1f0 160000 --- a/submodules/MaterialProviders +++ b/submodules/MaterialProviders @@ -1 +1 @@ -Subproject commit 70e580991678387ce897a286c4f7f449aa616785 +Subproject commit aa2bed1f0f9fbc48503870fe1b500a6aac59b130 From e44a1cfd01fc262a880a14eafd0c4c0e107ba817 Mon Sep 17 00:00:00 2001 From: seebees Date: Wed, 19 Mar 2025 16:53:05 -0700 Subject: [PATCH 3/4] use latest --- .../clientsupplier/regional_role_client_supplier.rs | 2 +- TestVectors/runtimes/rust/src/create_client.rs | 4 ++-- .../clientsupplier/regional_role_client_supplier.rs | 2 +- releases/rust/db_esdk/src/ddb.rs | 8 ++++---- releases/rust/db_esdk/src/kms.rs | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/DynamoDbEncryption/runtimes/rust/examples/clientsupplier/regional_role_client_supplier.rs b/DynamoDbEncryption/runtimes/rust/examples/clientsupplier/regional_role_client_supplier.rs index e1d485321..35fd7866c 100644 --- a/DynamoDbEncryption/runtimes/rust/examples/clientsupplier/regional_role_client_supplier.rs +++ b/DynamoDbEncryption/runtimes/rust/examples/clientsupplier/regional_role_client_supplier.rs @@ -35,7 +35,7 @@ impl ClientSupplier for RegionalRoleClientSupplier { let sdk_config = tokio::task::block_in_place(|| { tokio::runtime::Handle::current().block_on(async { - aws_config::load_defaults(aws_config::BehaviorVersion::v2024_03_28()).await + aws_config::load_defaults(aws_config::BehaviorVersion::latest()).await }) }); let kms_config = aws_sdk_kms::config::Builder::from(&sdk_config) diff --git a/TestVectors/runtimes/rust/src/create_client.rs b/TestVectors/runtimes/rust/src/create_client.rs index b8c885eb5..f14cbdaac 100644 --- a/TestVectors/runtimes/rust/src/create_client.rs +++ b/TestVectors/runtimes/rust/src/create_client.rs @@ -27,7 +27,7 @@ impl _CreateInterceptedDDBClient_Compile::_default { let table_configs = crate::deps::aws_cryptography_dbEncryptionSdk_dynamoDb_transforms::conversions::dynamo_db_tables_encryption_config::_dynamo_db_tables_encryption_config::plain_from_dafny(config); let shared_config = DAFNY_TOKIO_RUNTIME.block_on(aws_config::load_defaults( - aws_config::BehaviorVersion::v2024_03_28())); + aws_config::BehaviorVersion::latest())); let shared_config = shared_config .to_builder() @@ -49,7 +49,7 @@ impl _CreateInterceptedDDBClient_Compile::_default { -> Rc<_Wrappers_Compile::Result, Rc>> { let shared_config = DAFNY_TOKIO_RUNTIME.block_on(aws_config::load_defaults( - aws_config::BehaviorVersion::v2024_03_28())); + aws_config::BehaviorVersion::latest())); let shared_config = shared_config .to_builder() diff --git a/releases/rust/db_esdk/examples/clientsupplier/regional_role_client_supplier.rs b/releases/rust/db_esdk/examples/clientsupplier/regional_role_client_supplier.rs index e1d485321..35fd7866c 100644 --- a/releases/rust/db_esdk/examples/clientsupplier/regional_role_client_supplier.rs +++ b/releases/rust/db_esdk/examples/clientsupplier/regional_role_client_supplier.rs @@ -35,7 +35,7 @@ impl ClientSupplier for RegionalRoleClientSupplier { let sdk_config = tokio::task::block_in_place(|| { tokio::runtime::Handle::current().block_on(async { - aws_config::load_defaults(aws_config::BehaviorVersion::v2024_03_28()).await + aws_config::load_defaults(aws_config::BehaviorVersion::latest()).await }) }); let kms_config = aws_sdk_kms::config::Builder::from(&sdk_config) diff --git a/releases/rust/db_esdk/src/ddb.rs b/releases/rust/db_esdk/src/ddb.rs index fe250f86d..c5f65adaf 100644 --- a/releases/rust/db_esdk/src/ddb.rs +++ b/releases/rust/db_esdk/src/ddb.rs @@ -30,11 +30,11 @@ impl crate::r#software::amazon::cryptography::services::dynamodb::internaldafny: let shared_config = match tokio::runtime::Handle::try_current() { Ok(curr) => tokio::task::block_in_place(|| { curr.block_on(async { - aws_config::load_defaults(aws_config::BehaviorVersion::v2024_03_28()).await + aws_config::load_defaults(aws_config::BehaviorVersion::latest()).await }) }), Err(_) => DAFNY_TOKIO_RUNTIME.block_on(aws_config::load_defaults( - aws_config::BehaviorVersion::v2024_03_28(), + aws_config::BehaviorVersion::latest(), )), }; let shared_config = shared_config @@ -58,11 +58,11 @@ impl crate::r#software::amazon::cryptography::services::dynamodb::internaldafny: let shared_config = match tokio::runtime::Handle::try_current() { Ok(curr) => tokio::task::block_in_place(|| { curr.block_on(async { - aws_config::load_defaults(aws_config::BehaviorVersion::v2024_03_28()).await + aws_config::load_defaults(aws_config::BehaviorVersion::latest()).await }) }), Err(_) => DAFNY_TOKIO_RUNTIME.block_on(aws_config::load_defaults( - aws_config::BehaviorVersion::v2024_03_28(), + aws_config::BehaviorVersion::latest(), )), }; let inner = aws_sdk_dynamodb::Client::new(&shared_config); diff --git a/releases/rust/db_esdk/src/kms.rs b/releases/rust/db_esdk/src/kms.rs index a18e397ed..6778551e9 100644 --- a/releases/rust/db_esdk/src/kms.rs +++ b/releases/rust/db_esdk/src/kms.rs @@ -26,11 +26,11 @@ impl crate::r#software::amazon::cryptography::services::kms::internaldafny::_def let shared_config = match tokio::runtime::Handle::try_current() { Ok(curr) => tokio::task::block_in_place(|| { curr.block_on(async { - aws_config::load_defaults(aws_config::BehaviorVersion::v2024_03_28()).await + aws_config::load_defaults(aws_config::BehaviorVersion::latest()).await }) }), Err(_) => DAFNY_TOKIO_RUNTIME.block_on(aws_config::load_defaults( - aws_config::BehaviorVersion::v2024_03_28(), + aws_config::BehaviorVersion::latest(), )), }; @@ -51,11 +51,11 @@ impl crate::r#software::amazon::cryptography::services::kms::internaldafny::_def let shared_config = match tokio::runtime::Handle::try_current() { Ok(curr) => tokio::task::block_in_place(|| { curr.block_on(async { - aws_config::load_defaults(aws_config::BehaviorVersion::v2024_03_28()).await + aws_config::load_defaults(aws_config::BehaviorVersion::latest()).await }) }), Err(_) => DAFNY_TOKIO_RUNTIME.block_on(aws_config::load_defaults( - aws_config::BehaviorVersion::v2024_03_28(), + aws_config::BehaviorVersion::latest(), )), }; From 343cdc5b0e6114592397b832947436d47c47cd12 Mon Sep 17 00:00:00 2001 From: seebees Date: Thu, 20 Mar 2025 09:41:02 -0700 Subject: [PATCH 4/4] use the MPL version --- .github/actions/setup_dafny/action.yml | 29 ------------------- .github/workflows/ci_codegen.yml | 2 +- .github/workflows/ci_examples_java.yml | 2 +- .github/workflows/ci_examples_net.yml | 2 +- .github/workflows/ci_test_java.yml | 2 +- .../ci_test_latest_released_mpl_java.yml | 2 +- .github/workflows/ci_test_net.yml | 2 +- .github/workflows/ci_test_vector_java.yml | 2 +- .github/workflows/ci_test_vector_net.yml | 2 +- .../workflows/dafny_interop_examples_java.yml | 4 +-- .../workflows/dafny_interop_examples_net.yml | 4 +-- .github/workflows/dafny_interop_java.yml | 4 +-- .github/workflows/dafny_interop_test_net.yml | 4 +-- .../dafny_interop_test_vector_java.yml | 4 +-- .../dafny_interop_test_vector_net.yml | 4 +-- .../workflows/library_dafny_verification.yml | 2 +- .github/workflows/library_format.yml | 2 +- .github/workflows/library_rust_tests.yml | 2 +- .../workflows/test_vector_verification.yml | 2 +- 19 files changed, 24 insertions(+), 53 deletions(-) delete mode 100644 .github/actions/setup_dafny/action.yml diff --git a/.github/actions/setup_dafny/action.yml b/.github/actions/setup_dafny/action.yml deleted file mode 100644 index 8991a5b0b..000000000 --- a/.github/actions/setup_dafny/action.yml +++ /dev/null @@ -1,29 +0,0 @@ -# -# -# This local action consolidate all uses of dafny-lang/setup-dafny-action -# Once the MPL is updated, this action can point to the MPL version. -# -name: "Setup Dafny" -description: "This uses the setup Dafny action." -inputs: - dafny-version: - description: "The Dafny version to setup" - required: true - type: string -runs: - using: "composite" - steps: - # The dotnet tool requires >= 9.0.202 to work on MacOS - # See: https://github.com/dotnet/sdk/issues/46857#issuecomment-2734338347 - # Ideally this action would only install this on MacOS, - # but I do not want to keep track of the various values - # See: https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/store-information-in-variables#detecting-the-operating-system - - name: Setup .NET Core SDK '9.0.x' - uses: actions/setup-dotnet@v3 - with: - dotnet-version: "9.0.x" - - - name: Setup Dafny with setup-dafny action - uses: dafny-lang/setup-dafny-action@v1.8.0 - with: - dafny-version: ${{ inputs.dafny-version }} diff --git a/.github/workflows/ci_codegen.yml b/.github/workflows/ci_codegen.yml index 5ee3bd5af..311559b04 100644 --- a/.github/workflows/ci_codegen.yml +++ b/.github/workflows/ci_codegen.yml @@ -39,7 +39,7 @@ jobs: # and to translate version strings such as "nightly-latest" # to an actual DAFNY_VERSION. - name: Setup Dafny - uses: ./.github/actions/setup_dafny + uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/ with: dafny-version: ${{ inputs.dafny }} diff --git a/.github/workflows/ci_examples_java.yml b/.github/workflows/ci_examples_java.yml index b3016085d..c2621faa8 100644 --- a/.github/workflows/ci_examples_java.yml +++ b/.github/workflows/ci_examples_java.yml @@ -53,7 +53,7 @@ jobs: java-version: ${{ matrix.java-version }} - name: Setup Dafny - uses: ./.github/actions/setup_dafny + uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/ with: dafny-version: ${{ inputs.dafny }} diff --git a/.github/workflows/ci_examples_net.yml b/.github/workflows/ci_examples_net.yml index ca684926e..7e2e6ff01 100644 --- a/.github/workflows/ci_examples_net.yml +++ b/.github/workflows/ci_examples_net.yml @@ -46,7 +46,7 @@ jobs: dotnet-version: ${{ matrix.dotnet-version }} - name: Setup Dafny - uses: ./.github/actions/setup_dafny + uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/ with: dafny-version: ${{ inputs.dafny }} diff --git a/.github/workflows/ci_test_java.yml b/.github/workflows/ci_test_java.yml index 91b962abf..cf72acbac 100644 --- a/.github/workflows/ci_test_java.yml +++ b/.github/workflows/ci_test_java.yml @@ -47,7 +47,7 @@ jobs: submodules: recursive - name: Setup Dafny - uses: ./.github/actions/setup_dafny + uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/ with: dafny-version: ${{ inputs.dafny }} diff --git a/.github/workflows/ci_test_latest_released_mpl_java.yml b/.github/workflows/ci_test_latest_released_mpl_java.yml index 56d0bd998..7613b6662 100644 --- a/.github/workflows/ci_test_latest_released_mpl_java.yml +++ b/.github/workflows/ci_test_latest_released_mpl_java.yml @@ -54,7 +54,7 @@ jobs: java-version: ${{ matrix.java-version }} - name: Setup Dafny - uses: ./.github/actions/setup_dafny + uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/ with: dafny-version: ${{ needs.getVersion.outputs.version }} diff --git a/.github/workflows/ci_test_net.yml b/.github/workflows/ci_test_net.yml index a1f291aa9..4f8cbcee9 100644 --- a/.github/workflows/ci_test_net.yml +++ b/.github/workflows/ci_test_net.yml @@ -47,7 +47,7 @@ jobs: dotnet-version: ${{ matrix.dotnet-version }} - name: Setup Dafny - uses: ./.github/actions/setup_dafny + uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/ with: dafny-version: ${{ inputs.dafny }} diff --git a/.github/workflows/ci_test_vector_java.yml b/.github/workflows/ci_test_vector_java.yml index a82075641..6f310c42d 100644 --- a/.github/workflows/ci_test_vector_java.yml +++ b/.github/workflows/ci_test_vector_java.yml @@ -56,7 +56,7 @@ jobs: submodules: recursive - name: Setup Dafny - uses: ./.github/actions/setup_dafny + uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/ with: dafny-version: ${{ inputs.dafny }} diff --git a/.github/workflows/ci_test_vector_net.yml b/.github/workflows/ci_test_vector_net.yml index 8c266ae58..999e04e47 100644 --- a/.github/workflows/ci_test_vector_net.yml +++ b/.github/workflows/ci_test_vector_net.yml @@ -52,7 +52,7 @@ jobs: submodules: recursive - name: Setup Dafny - uses: ./.github/actions/setup_dafny + uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/ with: dafny-version: ${{ inputs.dafny }} diff --git a/.github/workflows/dafny_interop_examples_java.yml b/.github/workflows/dafny_interop_examples_java.yml index 9156664b7..4a77907e9 100644 --- a/.github/workflows/dafny_interop_examples_java.yml +++ b/.github/workflows/dafny_interop_examples_java.yml @@ -47,7 +47,7 @@ jobs: fetch-depth: 0 - name: Setup MPL Dafny - uses: ./.github/actions/setup_dafny + uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/ with: dafny-version: ${{ inputs.mpl-dafny }} @@ -73,7 +73,7 @@ jobs: make build_java CORES=$CORES - name: Setup DBESDK Dafny - uses: ./.github/actions/setup_dafny + uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/ with: dafny-version: ${{ inputs.dbesdk-dafny}} diff --git a/.github/workflows/dafny_interop_examples_net.yml b/.github/workflows/dafny_interop_examples_net.yml index a2a5b739d..7e3f031ab 100644 --- a/.github/workflows/dafny_interop_examples_net.yml +++ b/.github/workflows/dafny_interop_examples_net.yml @@ -47,7 +47,7 @@ jobs: dotnet-version: ${{ matrix.dotnet-version }} - name: Setup MPL Dafny - uses: ./.github/actions/setup_dafny + uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/ with: dafny-version: ${{ inputs.mpl-dafny }} @@ -80,7 +80,7 @@ jobs: make transpile_net CORES=$CORES - name: Setup DBESDK Dafny - uses: ./.github/actions/setup_dafny + uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/ with: dafny-version: ${{ inputs.dbesdk-dafny}} diff --git a/.github/workflows/dafny_interop_java.yml b/.github/workflows/dafny_interop_java.yml index 5621c0d3b..685d0035f 100644 --- a/.github/workflows/dafny_interop_java.yml +++ b/.github/workflows/dafny_interop_java.yml @@ -47,7 +47,7 @@ jobs: fetch-depth: 0 - name: Setup MPL Dafny - uses: ./.github/actions/setup_dafny + uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/ with: dafny-version: ${{ inputs.mpl-dafny }} @@ -73,7 +73,7 @@ jobs: make build_java CORES=$CORES - name: Setup DBESDK Dafny - uses: ./.github/actions/setup_dafny + uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/ with: dafny-version: ${{ inputs.dbesdk-dafny}} diff --git a/.github/workflows/dafny_interop_test_net.yml b/.github/workflows/dafny_interop_test_net.yml index 9816993d0..701794438 100644 --- a/.github/workflows/dafny_interop_test_net.yml +++ b/.github/workflows/dafny_interop_test_net.yml @@ -47,7 +47,7 @@ jobs: dotnet-version: ${{ matrix.dotnet-version }} - name: Setup MPL Dafny - uses: ./.github/actions/setup_dafny + uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/ with: dafny-version: ${{ inputs.mpl-dafny }} @@ -80,7 +80,7 @@ jobs: make transpile_net CORES=$CORES - name: Setup DBESDK Dafny - uses: ./.github/actions/setup_dafny + uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/ with: dafny-version: ${{ inputs.dbesdk-dafny}} diff --git a/.github/workflows/dafny_interop_test_vector_java.yml b/.github/workflows/dafny_interop_test_vector_java.yml index f5b325b93..1d29bf32f 100644 --- a/.github/workflows/dafny_interop_test_vector_java.yml +++ b/.github/workflows/dafny_interop_test_vector_java.yml @@ -56,7 +56,7 @@ jobs: fetch-depth: 0 - name: Setup MPL Dafny - uses: ./.github/actions/setup_dafny + uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/ with: dafny-version: ${{ inputs.mpl-dafny }} @@ -83,7 +83,7 @@ jobs: make mvn_local_deploy - name: Setup DBESDK Dafny - uses: ./.github/actions/setup_dafny + uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/ with: dafny-version: ${{ inputs.dbesdk-dafny}} diff --git a/.github/workflows/dafny_interop_test_vector_net.yml b/.github/workflows/dafny_interop_test_vector_net.yml index 373434c9a..139528dd3 100644 --- a/.github/workflows/dafny_interop_test_vector_net.yml +++ b/.github/workflows/dafny_interop_test_vector_net.yml @@ -52,7 +52,7 @@ jobs: dotnet-version: ${{ matrix.dotnet-version }} - name: Setup MPL Dafny - uses: ./.github/actions/setup_dafny + uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/ with: dafny-version: ${{ inputs.mpl-dafny }} @@ -85,7 +85,7 @@ jobs: make transpile_net CORES=$CORES - name: Setup DBESDK Dafny - uses: ./.github/actions/setup_dafny + uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/ with: dafny-version: ${{ inputs.dbesdk-dafny}} diff --git a/.github/workflows/library_dafny_verification.yml b/.github/workflows/library_dafny_verification.yml index d88804669..9b2d1e75e 100644 --- a/.github/workflows/library_dafny_verification.yml +++ b/.github/workflows/library_dafny_verification.yml @@ -53,7 +53,7 @@ jobs: submodules: recursive - name: Setup Dafny - uses: ./.github/actions/setup_dafny + uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/ with: dafny-version: ${{ inputs.dafny }} diff --git a/.github/workflows/library_format.yml b/.github/workflows/library_format.yml index cdb80b1be..1732bc57b 100644 --- a/.github/workflows/library_format.yml +++ b/.github/workflows/library_format.yml @@ -37,7 +37,7 @@ jobs: submodules: recursive - name: Setup Dafny - uses: ./.github/actions/setup_dafny + uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/ with: dafny-version: ${{ inputs.dafny }} diff --git a/.github/workflows/library_rust_tests.yml b/.github/workflows/library_rust_tests.yml index 0bbcb0848..987a6946a 100644 --- a/.github/workflows/library_rust_tests.yml +++ b/.github/workflows/library_rust_tests.yml @@ -68,7 +68,7 @@ jobs: components: rustfmt - name: Setup Dafny - uses: ./.github/actions/setup_dafny + uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/ with: dafny-version: nightly-2025-01-30-7db1e5f diff --git a/.github/workflows/test_vector_verification.yml b/.github/workflows/test_vector_verification.yml index 47b6eed34..e09c35f1b 100644 --- a/.github/workflows/test_vector_verification.yml +++ b/.github/workflows/test_vector_verification.yml @@ -43,7 +43,7 @@ jobs: submodules: recursive - name: Setup Dafny - uses: ./.github/actions/setup_dafny + uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/ with: dafny-version: ${{ inputs.dafny }}