Skip to content

Commit f977f11

Browse files
committed
Merge branch 'peg/attested-tls-crate' into peg/attested-tls-expose-cert-verifier
* peg/attested-tls-crate: (32 commits) chore: lint markdown chore: prettify Buildernet measurements should not be fetched on each test run - use a pre-fetched fixture Allow PCR register names to be given as eg. pcr4 in measurements JSON Fix DCAP register field names in measurements JSON format, allowing backwards compatibility Pin to specificy commit of ra-rls Convert test assests to yaml Prettify JSON in test assets Use fixed commit of dcap-qvl Add stable toolchain in CI Switch toolchain to stable, but in CI check for nightly fmt and clippy Move Azure root certs to separate files and include with include_str! Improve normalization for attestation provider URL Fix doccomment for clarity Change field name for clarity Improve check for running on GCP to match GCP documented standard Rename variable for clarity Typo Typo Typo ...
2 parents 2e4273c + a96ec2d commit f977f11

27 files changed

Lines changed: 1243 additions & 300 deletions

.github/workflows/test.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@ jobs:
1717
sudo apt-get update
1818
sudo apt-get install -y pkg-config libtss2-dev
1919
20-
- name: Set up Rust
20+
- name: Set up stable Rust
21+
uses: dtolnay/rust-toolchain@stable
22+
23+
- name: Set up nightly Rust for clippy/fmt
2124
uses: dtolnay/rust-toolchain@nightly
2225
with:
23-
toolchain: nightly
2426
components: rustfmt, clippy
2527

2628
- name: Cache dependencies
@@ -34,11 +36,11 @@ jobs:
3436
restore-keys: |
3537
${{ runner.os }}-cargo-
3638
37-
- name: Check formatting
38-
run: cargo fmt --all -- --check
39+
- name: Check formatting using nightly
40+
run: cargo +nightly fmt --all -- --check
3941

40-
- name: Run cargo clippy
41-
run: cargo clippy --workspace --features azure -- -D warnings
42+
- name: Run cargo clippy using nightly
43+
run: cargo +nightly clippy --workspace --features azure -- -D warnings
4244

4345
- name: Run cargo test
4446
run: cargo test --workspace --features azure --all-targets

.markdownlint.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
MD013: true # long lines
2+
MD033: false # in-line html
3+
MD037: false # spaces in emphasis

0 commit comments

Comments
 (0)