Skip to content

Commit 0b54c21

Browse files
authored
Merge branch 'main' into imabhichow/dafny-4.11
2 parents 9d457e4 + 453359a commit 0b54c21

File tree

37 files changed

+567
-1164
lines changed

37 files changed

+567
-1164
lines changed

.github/actions/install_smithy_dafny_codegen_dependencies/action.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,16 @@ runs:
3030
python -m pip install --upgrade black
3131
python -m pip install --upgrade docformatter
3232
33+
- name: Install Go
34+
uses: actions/setup-go@v2
35+
with:
36+
go-version: "1.23"
37+
38+
- name: Install Go imports
39+
shell: bash
40+
run: |
41+
go install golang.org/x/tools/cmd/goimports@latest
42+
3343
# Without this the if-dafny-at-least command includes "Downloading ..." output
3444
- name: Arbitrary makefile target to force downloading Gradle
3545
shell: bash

.github/actions/setup_dafny/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ runs:
2525
dotnet-version: "9.0.x"
2626

2727
- name: Setup Dafny with setup-dafny action
28-
uses: dafny-lang/setup-dafny-action@v1.8.0
28+
uses: dafny-lang/setup-dafny-action@v1.9.1
2929
with:
3030
dafny-version: ${{ inputs.dafny-version }}

.github/workflows/library_rust_tests.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@ jobs:
6868
if: matrix.os == 'windows-latest'
6969
uses: ilammy/setup-nasm@v1
7070

71+
# Go is needed for aws-lc-FIPS
72+
- name: Install Go
73+
uses: actions/setup-go@v5
74+
with:
75+
go-version: ">=1.18"
76+
7177
- name: Install Smithy-Dafny codegen dependencies
7278
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
7379

@@ -85,15 +91,17 @@ jobs:
8591
CORES=$(node -e 'console.log(os.cpus().length)')
8692
make transpile_rust TRANSPILE_TESTS_IN_RUST=1 CORES=$CORES
8793
88-
- name: Test Linter for Rust examples and implementation_from_dafny.rs
89-
working-directory: ${{ matrix.library }}/runtimes/rust
90-
shell: bash
91-
run: |
92-
cargo clippy
93-
9494
- name: Test ${{ matrix.library }} Rust
9595
shell: bash
9696
working-directory: ./${{ matrix.library }}
9797
run: |
9898
make test_rust
9999
make test_rust_debug
100+
101+
- name: Test ${{ matrix.library }} Rust Fips
102+
if: matrix.library == 'AwsCryptographyPrimitives' || matrix.library == 'AwsCryptographicMaterialProviders' || matrix.library == 'TestVectorsAwsCryptographicMaterialProviders'
103+
shell: bash
104+
working-directory: ./${{ matrix.library }}/runtimes/rust
105+
run: |
106+
cargo test --release --features fips -- --nocapture
107+
cargo test --features fips -- --nocapture

AwsCryptographicMaterialProviders/runtimes/go/ImplementationFromDafny-go/awscryptographykeystoresmithygenerated/to_dafny.go

Lines changed: 3 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)