diff --git a/ci/_ b/ci/_ index aeabaa7636..7f7fbd99a2 100644 --- a/ci/_ +++ b/ci/_ @@ -5,7 +5,13 @@ # |source| me # +base_dir=$(realpath --strip "$(dirname "$0")/..") + _() { - echo "--- $*" + if [[ $(pwd) = $base_dir ]]; then + echo "--- $*" + else + echo "--- $* (wd: $(pwd))" + fi "$@" } diff --git a/ci/test-checks.sh b/ci/test-checks.sh index 1d73de5b1b..80674f23b8 100755 --- a/ci/test-checks.sh +++ b/ci/test-checks.sh @@ -30,7 +30,8 @@ _ ci/check-ssh-keys.sh { cd programs/bpf - _ cargo +"$rust_stable" audit + # ignore RUSTSEC-2020-0006: https://github.com/rustwasm/wasm-bindgen/issues/2050 + _ cargo +"$rust_stable" audit --ignore RUSTSEC-2020-0006 for project in rust/*/ ; do echo "+++ do_bpf_checks $project" (