Update workflows

* Use the audit-check github action for cargo update. (It seems the ubuntu 24.04 runner image no longer includes cargo audit.) * Include rust version in cache key.
andyleiserson · Jan 13, 2025 · 67c7242 · 67c7242
1 parent a649118
commit 67c7242
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
@@ -24,6 +24,18 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: cargo audit
-        run: |
-          cargo audit
+      - uses: dtolnay/rust-toolchain@stable
+        id: rust-toolchain
+
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+          key: ${{ runner.os }}-${{ steps.rust-toolchain.outputs.cachekey }}-audit
+
+      - uses: rustsec/[email protected]
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -35,6 +35,7 @@ jobs:
       - uses: ./.github/actions/rm
 
       - uses: dtolnay/rust-toolchain@stable
+        id: rust-toolchain
         with:
           components: clippy,rustfmt
 
@@ -46,7 +47,7 @@ jobs:
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml') }}
+          key: ${{ runner.os }}-${{ steps.rust-toolchain.outputs.cachekey }}-cargo-${{ hashFiles('**/Cargo.toml') }}
 
       - name: Check formatting
         run: cargo fmt --all -- --check --config "imports_granularity=Crate,group_imports=StdExternalCrate"
@@ -86,6 +87,7 @@ jobs:
       - uses: ./.github/actions/rm
 
       - uses: dtolnay/rust-toolchain@stable
+        id: rust-toolchain
         with:
           components: clippy,rustfmt
 
@@ -97,7 +99,7 @@ jobs:
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml') }}
+          key: ${{ runner.os }}-${{ steps.rust-toolchain.outputs.cachekey }}-cargo-${{ hashFiles('**/Cargo.toml') }}
 
       - name: Release Build
         run: cargo build --release
@@ -120,6 +122,7 @@ jobs:
       - uses: ./.github/actions/rm
 
       - uses: dtolnay/rust-toolchain@stable
+        id: rust-toolchain
         with:
           components: clippy,rustfmt
 
@@ -131,7 +134,7 @@ jobs:
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml') }}
+          key: ${{ runner.os }}-${{ steps.rust-toolchain.outputs.cachekey }}-cargo-${{ hashFiles('**/Cargo.toml') }}
 
       - name: Build benchmarks
         run: cargo build --benches --no-default-features --features "enable-benches compact-gate"
@@ -170,7 +173,7 @@ jobs:
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml') }}
+          key: ${{ runner.os }}-${{ steps.rust-toolchain.outputs.cachekey }}-cargo-${{ hashFiles('**/Cargo.toml') }}
 
       - name: Slow Unit Tests
         run: cargo test -p ipa-core --lib -- mpc_proptest semi_honest_with_dp_slow gen_binomial_noise_16_breakdowns