From 0d7e09341584a33b0e9768361882ed05419ef556 Mon Sep 17 00:00:00 2001 From: Ryo Onodera Date: Tue, 4 Feb 2020 08:53:01 +0900 Subject: [PATCH] Broaden pattern in nits.sh to be less fragile (#8090) * Broaden pattern in nits.sh to be less fragile * Even more general matching --- ci/nits.sh | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/ci/nits.sh b/ci/nits.sh index 81bd3de3f3..02225184dc 100755 --- a/ci/nits.sh +++ b/ci/nits.sh @@ -18,20 +18,22 @@ declare prints=( # Parts of the tree that are expected to be print free declare print_free_tree=( - 'core/src' - 'faucet/src' - 'ledger/src' - 'metrics/src' - 'net-utils/src' - 'runtime/src' - 'sdk/bpf/rust/rust-utils' - 'sdk/src' - 'programs/bpf/rust' - 'programs/stake/src' - 'programs/vote/src' + ':core/src/**.rs' + ':faucet/src/**.rs' + ':ledger/src/**.rs' + ':metrics/src/**.rs' + ':net-utils/src/**.rs' + ':runtime/src/**.rs' + ':sdk/bpf/rust/rust-utils/**.rs' + ':sdk/**.rs' + ':programs/**.rs' + ':^**bin**.rs' + ':^**bench**.rs' + ':^**test**.rs' + ':^**/build.rs' ) -if _ git --no-pager grep -n --max-depth=0 "${prints[@]/#/-e }" -- "${print_free_tree[@]}"; then +if _ git --no-pager grep -n "${prints[@]/#/-e}" -- "${print_free_tree[@]}"; then exit 1 fi