v1.15: ci: suppress dep trees by default in ci/do-audit.sh (backpor…

…t of #30255) (#30286) ci: suppress dep trees by default in `ci/do-audit.sh` (#30255) get them back by passing `--display-dependency-trees` (cherry picked from commit 85af236) Co-authored-by: Trent Nelson <[email protected]>
solana-labs · Feb 13, 2023 · 9625e9d · 9625e9d
1 parent 6206ba5
commit 9625e9d
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/ci/do-audit.sh b/ci/do-audit.sh
@@ -7,6 +7,16 @@ src_root="$(readlink -f "${here}/..")"
 
 cd "${src_root}"
 
+# `cargo-audit` doesn't give us a way to do this nicely, so hammer it is...
+dep_tree_filter="grep -Ev '│|└|├|─'"
+
+while [[ -n $1 ]]; do
+  if [[ $1 = "--display-dependency-trees" ]]; then
+    dep_tree_filter="cat"
+    shift
+  fi
+done
+
 cargo_audit_ignores=(
   # Potential segfault in the time crate
   #
@@ -19,4 +29,4 @@ cargo_audit_ignores=(
   # https://github.com/solana-labs/solana/issues/29586
   --ignore RUSTSEC-2023-0001
 )
-scripts/cargo-for-all-lock-files.sh audit "${cargo_audit_ignores[@]}"
+scripts/cargo-for-all-lock-files.sh audit "${cargo_audit_ignores[@]}" | $dep_tree_filter