Skip to content

fix(ci): declare the failing-job list before the branch that can skip it #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
github-actions merged 1 commit into from
Aug 7, 2026
Merged

fix(ci): declare the failing-job list before the branch that can skip it #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion scripts/ci/auto-merge-sweep.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@ base_sha=$(gh api "repos/${REPO}/commits/${BASE_BRANCH}" --jq '.sha')
base_ci=$(gh run list --repo "$REPO" --workflow "$CI_WORKFLOW" --branch "$BASE_BRANCH" --limit 1 \
--json databaseId,status,conclusion,headSha --jq '.[0] // empty')

# Declared before the branch that can skip it: `set -u` is on and the merge
# site below always reads it. A base branch with no CI history takes the
# "proceeding" path, and an assignment living only in the else-branch made
# the entire sweep die with "base_red_jobs: unbound variable".
base_red_jobs=""

if [ -z "$base_ci" ]; then
echo "[auto-merge] no CI history for ${BASE_BRANCH} — proceeding"
else
Expand Down Expand Up @@ -96,7 +102,6 @@ else
# post-merge base is better than the pre-merge base. Still refused: a PR that
# does not cover the failing jobs, one that covers only some of them, and a
# base failure whose jobs cannot be identified at all.
base_red_jobs=""
if [ "$base_conclusion" != "success" ]; then
base_run_id=$(printf '%s' "${base_ci}" | jq -r '.databaseId')
base_red_jobs=$(gh run view "${base_run_id}" --repo "$REPO" --json jobs \
Expand Down
Loading