Skip to content

Commit 0b0df27

Browse files
authored
Merge pull request #82 from securesign/pull/upstream-update
tuftool v0.12.0: Pull upstream updates
2 parents aa0ca43 + b4aff8c commit 0b0df27

File tree

31 files changed

+1505
-684
lines changed

31 files changed

+1505
-684
lines changed

.github/workflows/rust.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
make_target: ["check-licenses", "build", "integ"]
18+
make_target: ["check-licenses", "build", "integ", "integ-fips"]
1919
os: [ubuntu-latest, windows-latest, macos-latest]
2020
exclude:
2121
- os: windows-latest
2222
make_target: check-licenses
2323
- os: macos-latest
2424
make_target: check-licenses
25+
- os: macos-latest
26+
make_target: integ-fips
2527
runs-on: ${{ matrix.os }}
2628
steps:
2729
- uses: actions/checkout@v4
@@ -33,6 +35,9 @@ jobs:
3335
key: ${{ hashFiles('.github/cache_bust') }}-${{ runner.os }}-${{ matrix.make_target }}-${{ hashFiles('**/Cargo.lock') }}
3436
restore-keys: |
3537
${{ hashFiles('.github/cache_bust') }}-${{ runner.os }}-${{ matrix.make_target }}
38+
- uses: ilammy/setup-nasm@v1 # requirement for windows FIPS builds
39+
- name: Install ninja-build tool
40+
uses: seanmiddleditch/gha-setup-ninja@v5
3641
# print the current rustc. replace stable to pin to a specific toolchain version.
3742
- run: rustup default stable
3843
- run: rustup component add rustfmt

0 commit comments

Comments
 (0)