From cc5f874c9ddd218a863836c6987347c5cdf30211 Mon Sep 17 00:00:00 2001 From: Jelte Fennema Date: Thu, 9 Jul 2020 12:10:25 +0200 Subject: [PATCH] Add some necessary citus enterprise support to CI helpers --- ci/check_all_ci_scripts_are_run.sh | 2 +- ci/ci_helpers.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/check_all_ci_scripts_are_run.sh b/ci/check_all_ci_scripts_are_run.sh index 0b7abb3e3..ac2c64d49 100755 --- a/ci/check_all_ci_scripts_are_run.sh +++ b/ci/check_all_ci_scripts_are_run.sh @@ -9,7 +9,7 @@ source ci/ci_helpers.sh # 2. Strip the directory # 3. Exclude some scripts that we should not run in CI directly ci_scripts=$( - find ci/ -iname "*.sh" | + find ci/ -maxdepth 1 -iname "*.sh" | sed -E 's#^ci/##g' | grep -v -E '^(ci_helpers.sh|fix_style.sh)$' ) diff --git a/ci/ci_helpers.sh b/ci/ci_helpers.sh index 9c0ab7a88..aa74c7b1b 100644 --- a/ci/ci_helpers.sh +++ b/ci/ci_helpers.sh @@ -23,10 +23,10 @@ hint_on_fail() { # Get filename of the currently running script # Source: https://stackoverflow.com/a/192337/2570866 filename=$(basename "$0") + directory=$(dirname "$0") if [ $exit_code != 0 ]; then - echo "HINT: To solve this failure look here: https://github.com/citusdata/citus/blob/master/ci/README.md#$filename" + echo "HINT: To solve this failure look here: https://github.com/citusdata/citus/blob/master/$directory/README.md#$filename" fi exit $exit_code } trap hint_on_fail EXIT -