Add some necessary citus enterprise support to CI helpers

pull/4009/head
Jelte Fennema 2020-07-09 12:10:25 +02:00
parent 4c68ed4c33
commit cc5f874c9d
2 changed files with 3 additions and 3 deletions

View File

@ -9,7 +9,7 @@ source ci/ci_helpers.sh
# 2. Strip the directory # 2. Strip the directory
# 3. Exclude some scripts that we should not run in CI directly # 3. Exclude some scripts that we should not run in CI directly
ci_scripts=$( ci_scripts=$(
find ci/ -iname "*.sh" | find ci/ -maxdepth 1 -iname "*.sh" |
sed -E 's#^ci/##g' | sed -E 's#^ci/##g' |
grep -v -E '^(ci_helpers.sh|fix_style.sh)$' grep -v -E '^(ci_helpers.sh|fix_style.sh)$'
) )

View File

@ -23,10 +23,10 @@ hint_on_fail() {
# Get filename of the currently running script # Get filename of the currently running script
# Source: https://stackoverflow.com/a/192337/2570866 # Source: https://stackoverflow.com/a/192337/2570866
filename=$(basename "$0") filename=$(basename "$0")
directory=$(dirname "$0")
if [ $exit_code != 0 ]; then 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 fi
exit $exit_code exit $exit_code
} }
trap hint_on_fail EXIT trap hint_on_fail EXIT