Update assert-changed-files.sh
This commit is contained in:
@@ -21,20 +21,16 @@ if [ "$IS_CI" = true ]; then
|
|||||||
git config --local --unset url."https://github.com/".insteadOf
|
git config --local --unset url."https://github.com/".insteadOf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Make sure that we are diffing towards the right branch, in github actions this is different
|
FILES_COUNT="$(git diff-tree --no-commit-id --name-only -r "$CIRCLE_BRANCH" origin/master | grep -E "$GREP_PATTERN" -c)"
|
||||||
# depending on whether or not we are creating a pull request or not.
|
|
||||||
[ ! -z ${GITHUB_BASE_REF} ] && HAS_BASE=true || HAS_BASE=false
|
|
||||||
[ HAS_BASE = true ] && COMPARE="${GITHUB_BASE_REF#refs/heads/}" || COMPARE="develop"
|
|
||||||
FILES_COUNT="$(git diff-tree --no-commit-id --name-only -r origin/"$COMPARE" | grep -E "$GREP_PATTERN" -c)"
|
|
||||||
|
|
||||||
if [ "$IS_CI" = true ]; then
|
if [ "$IS_CI" = true ]; then
|
||||||
# reset to previous state
|
# reset to previous state
|
||||||
git reset --hard $GITHUB_SHA
|
git reset --hard $CIRCLE_SHA1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$FILES_COUNT" -eq 0 ]; then
|
if [ "$FILES_COUNT" -eq 0 ]; then
|
||||||
echo "0 files matching '$GREP_PATTERN'; exiting and marking successful."
|
echo "0 files matching '$GREP_PATTERN'; exiting and marking successful."
|
||||||
exit 1
|
circleci step halt || exit 1
|
||||||
else
|
else
|
||||||
echo "$FILES_COUNT file(s) matching '$GREP_PATTERN'; continuing."
|
echo "$FILES_COUNT file(s) matching '$GREP_PATTERN'; continuing."
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user