Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 26 additions & 6 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
pull_request:
merge_group:
schedule:
- cron: '0 18 * * *'
- cron: "0 18 * * *"

jobs:
check:
Expand Down Expand Up @@ -40,7 +40,6 @@ jobs:
strategy:
matrix:
rust:
- stable
- 1.85
- nightly
steps:
Expand All @@ -50,14 +49,19 @@ jobs:
toolchain: ${{ matrix.rust }}
- run: RUSTFLAGS="-D warnings" cargo check --locked --all-targets --all-features

test:
name: Test Suite
needs: check
# Also covers `check-all-features` on stable: the powerset includes every
# combination except pairing the two aws-lc-rs backends, and the
# `--all-features` pairing is exercised by the `test_features` job.
feature-powerset:
name: Check feature powerset
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- run: cargo test --locked --all-features
- uses: taiki-e/install-action@cargo-hack
# The two aws-lc-rs backends are never used together outside of
# --all-features builds, so skip those combinations.
- run: RUSTFLAGS="-D warnings" cargo hack check --locked --all-targets --feature-powerset --mutually-exclusive-features verify-aws,verify-aws-fips
Comment thread
cpu marked this conversation as resolved.

test_features:
name: Test suite (with features)
Expand All @@ -71,13 +75,29 @@ jobs:
- --all-features
- --features=verify
- --features=verify-aws
- --features=verify-aws-fips
- --features=validate
steps:
- uses: actions/checkout@v4
- name: Install stable toolchain
uses: dtolnay/rust-toolchain@stable
- run: cargo test --locked ${{ matrix.features }}

test_fips:
name: verify-aws-fips dependency on FIPS backend only
Comment thread
cpu marked this conversation as resolved.
needs: check-all-features
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install stable toolchain
uses: dtolnay/rust-toolchain@stable
# Ensure the non-FIPS aws-lc-sys crate is not part of the dependency tree.
#
# "cargo tree" exits 101 when queried for a crate that's not in the tree.
- run: "if cargo tree --features=verify-aws-fips -i aws-lc-sys; then false; else [ $? -eq 101 ]; fi"
Comment thread
domodwyer marked this conversation as resolved.
# Ensure the optional FIPS crypto module is depended.
- run: "cargo tree --features=verify-aws-fips -i aws-lc-fips-sys"

Comment thread
cpu marked this conversation as resolved.
fmt:
name: Rustfmt
runs-on: ubuntu-latest
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

### Added/Changed/Fixed

- Add new feature `verify-aws-fips` to use the FIPS-approved crypto module of `aws-lc-rs` (#233)

### Thanks

## 0.18.0
Expand Down
Loading
Loading