Merge branch 'awslabs:develop' into feature/sha512

awslabs · Feb 10, 2025 · 79f96bd · 79f96bd
2 parents 4034ef1 + 4849410
commit 79f96bd
Show file tree

Hide file tree

Showing 20 changed files with 933 additions and 427 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -15,13 +15,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        make_target: ["check-licenses", "build", "integ"]
+        make_target: ["check-licenses", "build", "integ", "integ-fips"]
         os: [ubuntu-latest, windows-latest, macos-latest]
         exclude:
           - os: windows-latest
             make_target: check-licenses
           - os: macos-latest
             make_target: check-licenses
+          - os: macos-latest
+            make_target: integ-fips
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -33,6 +35,9 @@ jobs:
           key: ${{ hashFiles('.github/cache_bust') }}-${{ runner.os }}-${{ matrix.make_target }}-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
             ${{ hashFiles('.github/cache_bust') }}-${{ runner.os }}-${{ matrix.make_target }}
+      - uses: ilammy/setup-nasm@v1 # requirement for windows FIPS builds
+      - name: Install ninja-build tool
+        uses: seanmiddleditch/gha-setup-ninja@v5
       # print the current rustc. replace stable to pin to a specific toolchain version.
       - run: rustup default stable
       - run: rustup component add rustfmt