Merge pull request #337 from mozilla/fix_ci

fix ci
mozilla · Oct 5, 2022 · 7257bfc · 7257bfc
2 parents ed251ad + a2b9ffb
commit 7257bfc
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 2 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -48,7 +48,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Run cargo test
         run: |
-          cargo test --workspace --examples --bins
+          cargo test --workspace --all-targets
 
   vet:
     runs-on: ubuntu-latest

diff --git a/src/storage.rs b/src/storage.rs
@@ -509,7 +509,7 @@ impl Store {
         // validate that our imports.lock is in sync with config.toml.
         let imports_lock_outdated = self
             .imports_lock_outdated()
-            .then(|| StoreValidateError::ImportsLockOutdated);
+            .then_some(StoreValidateError::ImportsLockOutdated);
 
         let errors = invalid_criteria_errors
             .into_iter()

diff --git a/tests/snapshots/test_cli__long-help.snap b/tests/snapshots/test_cli__long-help.snap
@@ -149,6 +149,8 @@ SUBCOMMANDS:
             Reformat all of vet's files (in case you hand-edited them)
     fetch-imports
             Explicitly fetch the imports (foreign audit files)
+    aggregate
+            Fetch and merge audits from multiple sources into a single `audits.toml` file
     dump-graph
             Print the cargo build graph as understood by `cargo vet`
     gc

diff --git a/tests/snapshots/test_cli__markdown-help.snap b/tests/snapshots/test_cli__markdown-help.snap
@@ -147,6 +147,7 @@ graph
 * [record-violation](#cargo-vet-record-violation): Declare that some versions of a package violate certain audit criteria
 * [fmt](#cargo-vet-fmt): Reformat all of vet's files (in case you hand-edited them)
 * [fetch-imports](#cargo-vet-fetch-imports): Explicitly fetch the imports (foreign audit files)
+* [aggregate](#cargo-vet-aggregate): Fetch and merge audits from multiple sources into a single `audits.toml` file
 * [dump-graph](#cargo-vet-dump-graph): Print the cargo build graph as understood by `cargo vet`
 * [gc](#cargo-vet-gc): Clean up old packages from the vet cache
 * [help](#cargo-vet-help): Print this message or the help of the given subcommand(s)
@@ -654,6 +655,29 @@ Print help information
 ### GLOBAL OPTIONS
 This subcommand accepts all the [global options](#global-options)
 
+<br><br><br>
+## cargo vet aggregate
+Fetch and merge audits from multiple sources into a single `audits.toml` file.
+
+Will fetch the audits from each URL in the provided file, combining them into a single file. Custom
+criteria will be merged by-name, and must have identical descriptions in each source audit file.
+
+### USAGE
+```
+cargo vet aggregate [OPTIONS] <SOURCES>
+```
+
+### ARGS
+#### `<SOURCES>`
+Path to a file containing a list of URLs to aggregate the audits from
+
+### OPTIONS
+#### `-h, --help`
+Print help information
+
+### GLOBAL OPTIONS
+This subcommand accepts all the [global options](#global-options)
+
 <br><br><br>
 ## cargo vet dump-graph
 Print the cargo build graph as understood by `cargo vet`

diff --git a/tests/snapshots/test_cli__short-help.snap b/tests/snapshots/test_cli__short-help.snap
@@ -70,6 +70,8 @@ SUBCOMMANDS:
     record-violation    Declare that some versions of a package violate certain audit criteria
     fmt                 Reformat all of vet's files (in case you hand-edited them)
     fetch-imports       Explicitly fetch the imports (foreign audit files)
+    aggregate           Fetch and merge audits from multiple sources into a single `audits.toml`
+                            file
     dump-graph          Print the cargo build graph as understood by `cargo vet`
     gc                  Clean up old packages from the vet cache
     help                Print this message or the help of the given subcommand(s)