Skip to content

Commit 6f729c3

Browse files
seebeesseebees
authored
chore: re-enable Dafny for MacOS (#1738)
.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.
1 parent d988c6e commit 6f729c3

24 files changed

+37
-37
lines changed

Diff for: ‎.github/workflows/ci_codegen.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
# and to translate version strings such as "nightly-latest"
4040
# to an actual DAFNY_VERSION.
4141
- name: Setup Dafny
42-
uses: dafny-lang/[email protected]
42+
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
4343
with:
4444
dafny-version: ${{ inputs.dafny }}
4545

Diff for: ‎.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]
56+
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
5757
with:
5858
dafny-version: ${{ inputs.dafny }}
5959

Diff for: ‎.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]
49+
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
5050
with:
5151
dafny-version: ${{ inputs.dafny }}
5252

Diff for: ‎.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]
50+
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
5151
with:
5252
dafny-version: ${{ inputs.dafny }}
5353

Diff for: ‎.github/workflows/ci_test_latest_released_mpl_java.yml

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

5656
- name: Setup Dafny
57-
uses: dafny-lang/[email protected]
57+
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
5858
with:
5959
dafny-version: ${{ needs.getVersion.outputs.version }}
6060

Diff for: ‎.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]
50+
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
5151
with:
5252
dafny-version: ${{ inputs.dafny }}
5353

Diff for: ‎.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]
59+
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
6060
with:
6161
dafny-version: ${{ inputs.dafny }}
6262

Diff for: ‎.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]
55+
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
5656
with:
5757
dafny-version: ${{ inputs.dafny }}
5858

Diff for: ‎.github/workflows/dafny_interop_examples_java.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
fetch-depth: 0
4848

4949
- name: Setup MPL Dafny
50-
uses: dafny-lang/[email protected]
50+
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
5151
with:
5252
dafny-version: ${{ inputs.mpl-dafny }}
5353

@@ -73,7 +73,7 @@ jobs:
7373
make build_java CORES=$CORES
7474
7575
- name: Setup DBESDK Dafny
76-
uses: dafny-lang/[email protected]
76+
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
7777
with:
7878
dafny-version: ${{ inputs.dbesdk-dafny}}
7979

Diff for: ‎.github/workflows/dafny_interop_examples_net.yml

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

4949
- name: Setup MPL Dafny
50-
uses: dafny-lang/[email protected]
50+
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
5151
with:
5252
dafny-version: ${{ inputs.mpl-dafny }}
5353

@@ -80,7 +80,7 @@ jobs:
8080
make transpile_net CORES=$CORES
8181
8282
- name: Setup DBESDK Dafny
83-
uses: dafny-lang/[email protected]
83+
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
8484
with:
8585
dafny-version: ${{ inputs.dbesdk-dafny}}
8686

Diff for: ‎.github/workflows/dafny_interop_java.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
fetch-depth: 0
4848

4949
- name: Setup MPL Dafny
50-
uses: dafny-lang/[email protected]
50+
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
5151
with:
5252
dafny-version: ${{ inputs.mpl-dafny }}
5353

@@ -73,7 +73,7 @@ jobs:
7373
make build_java CORES=$CORES
7474
7575
- name: Setup DBESDK Dafny
76-
uses: dafny-lang/[email protected]
76+
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
7777
with:
7878
dafny-version: ${{ inputs.dbesdk-dafny}}
7979

Diff for: ‎.github/workflows/dafny_interop_test_net.yml

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

4949
- name: Setup MPL Dafny
50-
uses: dafny-lang/[email protected]
50+
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
5151
with:
5252
dafny-version: ${{ inputs.mpl-dafny }}
5353

@@ -80,7 +80,7 @@ jobs:
8080
make transpile_net CORES=$CORES
8181
8282
- name: Setup DBESDK Dafny
83-
uses: dafny-lang/[email protected]
83+
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
8484
with:
8585
dafny-version: ${{ inputs.dbesdk-dafny}}
8686

Diff for: ‎.github/workflows/dafny_interop_test_vector_java.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
fetch-depth: 0
5757

5858
- name: Setup MPL Dafny
59-
uses: dafny-lang/[email protected]
59+
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
6060
with:
6161
dafny-version: ${{ inputs.mpl-dafny }}
6262

@@ -83,7 +83,7 @@ jobs:
8383
make mvn_local_deploy
8484
8585
- name: Setup DBESDK Dafny
86-
uses: dafny-lang/[email protected]
86+
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
8787
with:
8888
dafny-version: ${{ inputs.dbesdk-dafny}}
8989

Diff for: ‎.github/workflows/dafny_interop_test_vector_net.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
dotnet-version: ${{ matrix.dotnet-version }}
5353

5454
- name: Setup MPL Dafny
55-
uses: dafny-lang/[email protected]
55+
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
5656
with:
5757
dafny-version: ${{ inputs.mpl-dafny }}
5858

@@ -85,7 +85,7 @@ jobs:
8585
make transpile_net CORES=$CORES
8686
8787
- name: Setup DBESDK Dafny
88-
uses: dafny-lang/[email protected]
88+
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
8989
with:
9090
dafny-version: ${{ inputs.dbesdk-dafny}}
9191

Diff for: ‎.github/workflows/library_dafny_verification.yml

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

5555
- name: Setup Dafny
56-
uses: dafny-lang/[email protected]
56+
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
5757
with:
5858
dafny-version: ${{ inputs.dafny }}
5959

Diff for: ‎.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]
40+
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
4141
with:
4242
dafny-version: ${{ inputs.dafny }}
4343

Diff for: ‎.github/workflows/library_rust_tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
components: rustfmt
6969

7070
- name: Setup Dafny
71-
uses: dafny-lang/[email protected]
71+
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
7272
with:
7373
dafny-version: nightly-2025-01-30-7db1e5f
7474

Diff for: ‎.github/workflows/test_vector_verification.yml

+1-1
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]
46+
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
4747
with:
4848
dafny-version: ${{ inputs.dafny }}
4949

Diff for: ‎DynamoDbEncryption/runtimes/rust/examples/clientsupplier/regional_role_client_supplier.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ impl ClientSupplier for RegionalRoleClientSupplier {
3535

3636
let sdk_config = tokio::task::block_in_place(|| {
3737
tokio::runtime::Handle::current().block_on(async {
38-
aws_config::load_defaults(aws_config::BehaviorVersion::v2024_03_28()).await
38+
aws_config::load_defaults(aws_config::BehaviorVersion::latest()).await
3939
})
4040
});
4141
let kms_config = aws_sdk_kms::config::Builder::from(&sdk_config)

Diff for: ‎TestVectors/runtimes/rust/src/create_client.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ impl _CreateInterceptedDDBClient_Compile::_default {
2727

2828
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);
2929
let shared_config = DAFNY_TOKIO_RUNTIME.block_on(aws_config::load_defaults(
30-
aws_config::BehaviorVersion::v2024_03_28()));
30+
aws_config::BehaviorVersion::latest()));
3131

3232
let shared_config = shared_config
3333
.to_builder()
@@ -49,7 +49,7 @@ impl _CreateInterceptedDDBClient_Compile::_default {
4949
-> Rc<_Wrappers_Compile::Result<Object<dyn IDynamoDBClient>, Rc<Error>>>
5050
{
5151
let shared_config = DAFNY_TOKIO_RUNTIME.block_on(aws_config::load_defaults(
52-
aws_config::BehaviorVersion::v2024_03_28()));
52+
aws_config::BehaviorVersion::latest()));
5353

5454
let shared_config = shared_config
5555
.to_builder()

Diff for: ‎releases/rust/db_esdk/examples/clientsupplier/regional_role_client_supplier.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ impl ClientSupplier for RegionalRoleClientSupplier {
3535

3636
let sdk_config = tokio::task::block_in_place(|| {
3737
tokio::runtime::Handle::current().block_on(async {
38-
aws_config::load_defaults(aws_config::BehaviorVersion::v2024_03_28()).await
38+
aws_config::load_defaults(aws_config::BehaviorVersion::latest()).await
3939
})
4040
});
4141
let kms_config = aws_sdk_kms::config::Builder::from(&sdk_config)

Diff for: ‎releases/rust/db_esdk/src/ddb.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ impl crate::r#software::amazon::cryptography::services::dynamodb::internaldafny:
3030
let shared_config = match tokio::runtime::Handle::try_current() {
3131
Ok(curr) => tokio::task::block_in_place(|| {
3232
curr.block_on(async {
33-
aws_config::load_defaults(aws_config::BehaviorVersion::v2024_03_28()).await
33+
aws_config::load_defaults(aws_config::BehaviorVersion::latest()).await
3434
})
3535
}),
3636
Err(_) => DAFNY_TOKIO_RUNTIME.block_on(aws_config::load_defaults(
37-
aws_config::BehaviorVersion::v2024_03_28(),
37+
aws_config::BehaviorVersion::latest(),
3838
)),
3939
};
4040
let shared_config = shared_config
@@ -58,11 +58,11 @@ impl crate::r#software::amazon::cryptography::services::dynamodb::internaldafny:
5858
let shared_config = match tokio::runtime::Handle::try_current() {
5959
Ok(curr) => tokio::task::block_in_place(|| {
6060
curr.block_on(async {
61-
aws_config::load_defaults(aws_config::BehaviorVersion::v2024_03_28()).await
61+
aws_config::load_defaults(aws_config::BehaviorVersion::latest()).await
6262
})
6363
}),
6464
Err(_) => DAFNY_TOKIO_RUNTIME.block_on(aws_config::load_defaults(
65-
aws_config::BehaviorVersion::v2024_03_28(),
65+
aws_config::BehaviorVersion::latest(),
6666
)),
6767
};
6868
let inner = aws_sdk_dynamodb::Client::new(&shared_config);

Diff for: ‎releases/rust/db_esdk/src/kms.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ impl crate::r#software::amazon::cryptography::services::kms::internaldafny::_def
2626
let shared_config = match tokio::runtime::Handle::try_current() {
2727
Ok(curr) => tokio::task::block_in_place(|| {
2828
curr.block_on(async {
29-
aws_config::load_defaults(aws_config::BehaviorVersion::v2024_03_28()).await
29+
aws_config::load_defaults(aws_config::BehaviorVersion::latest()).await
3030
})
3131
}),
3232
Err(_) => DAFNY_TOKIO_RUNTIME.block_on(aws_config::load_defaults(
33-
aws_config::BehaviorVersion::v2024_03_28(),
33+
aws_config::BehaviorVersion::latest(),
3434
)),
3535
};
3636

@@ -51,11 +51,11 @@ impl crate::r#software::amazon::cryptography::services::kms::internaldafny::_def
5151
let shared_config = match tokio::runtime::Handle::try_current() {
5252
Ok(curr) => tokio::task::block_in_place(|| {
5353
curr.block_on(async {
54-
aws_config::load_defaults(aws_config::BehaviorVersion::v2024_03_28()).await
54+
aws_config::load_defaults(aws_config::BehaviorVersion::latest()).await
5555
})
5656
}),
5757
Err(_) => DAFNY_TOKIO_RUNTIME.block_on(aws_config::load_defaults(
58-
aws_config::BehaviorVersion::v2024_03_28(),
58+
aws_config::BehaviorVersion::latest(),
5959
)),
6060
};
6161

Diff for: ‎submodules/MaterialProviders

0 commit comments

Comments
 (0)