Skip to content

Commit

Permalink
ci: fix CI skip script hole (#21741)
Browse files Browse the repository at this point in the history
In some environments, the script will not fail despite SKIP_CHECK_BRANCH
being unset, leading to the script explicitly skipping CI when it should
fail fast.

Prevent this by explicitly checking for the env var.
  • Loading branch information
zalimeni authored Sep 16, 2024
1 parent 17d43c6 commit 5e20e13
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions .github/scripts/check_skip_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ set -euo pipefail
#
# ... `git merge-base origin/$SKIP_CHECK_BRANCH HEAD` would return commit `D`
# `...HEAD` specifies from the common ancestor to the latest commit on the current branch (HEAD)..
files_to_check=$(git diff --name-only "$(git merge-base origin/$SKIP_CHECK_BRANCH HEAD~)"...HEAD)
skip_check_branch=${SKIP_CHECK_BRANCH:?SKIP_CHECK_BRANCH is required}
files_to_check=$(git diff --name-only "$(git merge-base origin/$skip_check_branch HEAD~)"...HEAD)

# Define the directories to check
skipped_directories=("docs/" "ui/" "website/" "grafana/" ".changelog/")
Expand Down Expand Up @@ -46,4 +47,4 @@ for file_to_check in "${files_to_check_array[@]}"; do
done

echo "Changes detected in only documentation files - skipping tests and build"
echo "skip-ci=true" >> "$GITHUB_OUTPUT"
echo "skip-ci=true" >> "$GITHUB_OUTPUT"

0 comments on commit 5e20e13

Please sign in to comment.