Skip to content

chore: re-enable Dafny for MacOS #1738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 20, 2025
Merged

chore: re-enable Dafny for MacOS #1738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4c709d9
chore: re-enable Dafny for MacOS
seebees Mar 19, 2025
505ccfd
update to latest MPL
seebees Mar 19, 2025
e44a1cf
use latest
seebees Mar 19, 2025
343cdc5
use the MPL version
seebees Mar 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci_codegen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ./submodules/MaterialProviders/.github/actions/setup_dafny/
with:
dafny-version: ${{ inputs.dafny }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_examples_java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
java-version: ${{ matrix.java-version }}

- name: Setup Dafny
uses: dafny-lang/setup-dafny-action@v1.8.0
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
with:
dafny-version: ${{ inputs.dafny }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_examples_net.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
dotnet-version: ${{ matrix.dotnet-version }}

- name: Setup Dafny
uses: dafny-lang/setup-dafny-action@v1.8.0
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
with:
dafny-version: ${{ inputs.dafny }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_test_java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
submodules: recursive

- name: Setup Dafny
uses: dafny-lang/setup-dafny-action@v1.8.0
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
with:
dafny-version: ${{ inputs.dafny }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_test_latest_released_mpl_java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
java-version: ${{ matrix.java-version }}

- name: Setup Dafny
uses: dafny-lang/setup-dafny-action@v1.8.0
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
with:
dafny-version: ${{ needs.getVersion.outputs.version }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_test_net.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
dotnet-version: ${{ matrix.dotnet-version }}

- name: Setup Dafny
uses: dafny-lang/setup-dafny-action@v1.8.0
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
with:
dafny-version: ${{ inputs.dafny }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_test_vector_java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
submodules: recursive

- name: Setup Dafny
uses: dafny-lang/setup-dafny-action@v1.8.0
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
with:
dafny-version: ${{ inputs.dafny }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_test_vector_net.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
submodules: recursive

- name: Setup Dafny
uses: dafny-lang/setup-dafny-action@v1.8.0
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
with:
dafny-version: ${{ inputs.dafny }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dafny_interop_examples_java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
fetch-depth: 0

- name: Setup MPL Dafny
uses: dafny-lang/setup-dafny-action@v1.8.0
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
with:
dafny-version: ${{ inputs.mpl-dafny }}

Expand All @@ -73,7 +73,7 @@ jobs:
make build_java CORES=$CORES

- name: Setup DBESDK Dafny
uses: dafny-lang/setup-dafny-action@v1.8.0
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
with:
dafny-version: ${{ inputs.dbesdk-dafny}}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dafny_interop_examples_net.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
dotnet-version: ${{ matrix.dotnet-version }}

- name: Setup MPL Dafny
uses: dafny-lang/setup-dafny-action@v1.8.0
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
with:
dafny-version: ${{ inputs.mpl-dafny }}

Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
make transpile_net CORES=$CORES

- name: Setup DBESDK Dafny
uses: dafny-lang/setup-dafny-action@v1.8.0
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
with:
dafny-version: ${{ inputs.dbesdk-dafny}}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dafny_interop_java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
fetch-depth: 0

- name: Setup MPL Dafny
uses: dafny-lang/setup-dafny-action@v1.8.0
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
with:
dafny-version: ${{ inputs.mpl-dafny }}

Expand All @@ -73,7 +73,7 @@ jobs:
make build_java CORES=$CORES

- name: Setup DBESDK Dafny
uses: dafny-lang/setup-dafny-action@v1.8.0
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
with:
dafny-version: ${{ inputs.dbesdk-dafny}}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dafny_interop_test_net.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
dotnet-version: ${{ matrix.dotnet-version }}

- name: Setup MPL Dafny
uses: dafny-lang/setup-dafny-action@v1.8.0
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
with:
dafny-version: ${{ inputs.mpl-dafny }}

Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
make transpile_net CORES=$CORES

- name: Setup DBESDK Dafny
uses: dafny-lang/setup-dafny-action@v1.8.0
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
with:
dafny-version: ${{ inputs.dbesdk-dafny}}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dafny_interop_test_vector_java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
fetch-depth: 0

- name: Setup MPL Dafny
uses: dafny-lang/setup-dafny-action@v1.8.0
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
with:
dafny-version: ${{ inputs.mpl-dafny }}

Expand All @@ -83,7 +83,7 @@ jobs:
make mvn_local_deploy

- name: Setup DBESDK Dafny
uses: dafny-lang/setup-dafny-action@v1.8.0
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
with:
dafny-version: ${{ inputs.dbesdk-dafny}}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dafny_interop_test_vector_net.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
dotnet-version: ${{ matrix.dotnet-version }}

- name: Setup MPL Dafny
uses: dafny-lang/setup-dafny-action@v1.8.0
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
with:
dafny-version: ${{ inputs.mpl-dafny }}

Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
make transpile_net CORES=$CORES

- name: Setup DBESDK Dafny
uses: dafny-lang/setup-dafny-action@v1.8.0
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
with:
dafny-version: ${{ inputs.dbesdk-dafny}}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/library_dafny_verification.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
submodules: recursive

- name: Setup Dafny
uses: dafny-lang/setup-dafny-action@v1.8.0
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
with:
dafny-version: ${{ inputs.dafny }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/library_format.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
submodules: recursive

- name: Setup Dafny
uses: dafny-lang/setup-dafny-action@v1.8.0
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
with:
dafny-version: ${{ inputs.dafny }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/library_rust_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
components: rustfmt

- name: Setup Dafny
uses: dafny-lang/setup-dafny-action@v1.8.0
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
with:
dafny-version: nightly-2025-01-30-7db1e5f

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_vector_verification.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
submodules: recursive

- name: Setup Dafny
uses: dafny-lang/setup-dafny-action@v1.8.0
uses: ./submodules/MaterialProviders/.github/actions/setup_dafny/
with:
dafny-version: ${{ inputs.dafny }}

Expand Down
2 changes: 1 addition & 1 deletion DynamoDbEncryption/runtimes/rust/examples/clientsupplier/regional_role_client_supplier.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions TestVectors/runtimes/rust/src/create_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -49,7 +49,7 @@ impl _CreateInterceptedDDBClient_Compile::_default {
-> Rc<_Wrappers_Compile::Result<Object<dyn IDynamoDBClient>, Rc<Error>>>
{
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()
Expand Down
2 changes: 1 addition & 1 deletion releases/rust/db_esdk/examples/clientsupplier/regional_role_client_supplier.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions releases/rust/db_esdk/src/ddb.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions releases/rust/db_esdk/src/kms.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
)),
};

Expand All @@ -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(),
)),
};

Expand Down
2 changes: 1 addition & 1 deletion submodules/MaterialProviders
Open in desktop
Submodule MaterialProviders updated from 70e580 to aa2bed
Loading