Skip to content

Abort the resume when label or comment reads fail #50

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

Open
Phlogistique wants to merge 1 commit into
base: claude/pr-number-addressing-3njvdx
Choose a base branch
from
+14 −4
Open

Abort the resume when label or comment reads fail #50

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
18 changes: 14 additions & 4 deletions update-pr-stack.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,16 @@ format_state_marker() {
}

# Echoes the most recent state-marker line found in our PR comments, or nothing.
# A failed comments fetch aborts the run: treating it as "no marker" would make
# the caller abandon the resume and drop the conflict label for good.
read_state_marker() {
local PR_NUMBER="$1"
gh pr view "$PR_NUMBER" --json comments --jq '.comments[].body' 2>/dev/null \
| { grep -F "$STATE_MARKER_PREFIX" || true; } | tail -n1
local BODIES
if ! BODIES=$(gh pr view "$PR_NUMBER" --json comments --jq '.comments[].body'); then
echo "Error: could not read comments of PR #$PR_NUMBER" >&2
exit 1
fi
{ grep -F "$STATE_MARKER_PREFIX" <<<"$BODIES" || true; } | tail -n1
}

# Args: a marker line. Echoes "base target squash".
Expand Down Expand Up @@ -173,11 +179,15 @@ See $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID"
return 0
}

# Check if a PR has the conflict resolution label
# Check if a PR has the conflict resolution label. A failed labels fetch aborts
# the run rather than reading as "no label", which would silently skip a resume.
pr_has_conflict_label() {
local PR_NUMBER="$1"
local LABELS
LABELS=$(gh pr view "$PR_NUMBER" --json labels --jq '.labels[].name' 2>/dev/null || echo "")
if ! LABELS=$(gh pr view "$PR_NUMBER" --json labels --jq '.labels[].name'); then
echo "Error: could not read labels of PR #$PR_NUMBER" >&2
exit 1
fi
echo "$LABELS" | grep -q "^${CONFLICT_LABEL}$"
}

Expand Down
Loading