Skip to content

ci: auto-rebase PRs before enabling auto-merge #11

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
sentomk merged 2 commits into from
Jun 30, 2026
Merged

ci: auto-rebase PRs before enabling auto-merge #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fdbabf5
ci: auto-rebase PRs before enabling auto-merge
sentomk Jun 30, 2026
dfee5b0
Merge branch 'canon' into ci/automerge-rebase
sentomk Jun 30, 2026
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
24 changes: 20 additions & 4 deletions .github/workflows/auto-merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,31 @@ jobs:
GH_TOKEN: ${{ steps.app-token.outputs.token }}
REPO: ${{ github.repository }}
run: |
# Get all open PRs where all completed checks passed
prs=$(gh pr list -R "$REPO" --state open --json number,statusCheckRollup \
--jq '.[] | select(.statusCheckRollup | map(select(.conclusion != "" and .conclusion != "SUCCESS")) | length == 0) | .number')
# Get all open PRs where all completed checks passed, with mergeable state
prs=$(gh pr list -R "$REPO" --state open \
--json number,statusCheckRollup,mergeable \
--jq '.[] | select(.statusCheckRollup | map(select(.conclusion != "" and .conclusion != "SUCCESS")) | length == 0) | select(.mergeable == "MERGEABLE") | .number')
if [ -z "$prs" ]; then
echo "No PRs with all checks passed."
exit 0
fi
echo "PRs ready to auto-merge: $prs"
for num in $prs; do
echo "Enabling auto-merge for PR #$num..."
echo "--- Processing PR #$num ---"

# Rebase if behind
state=$(gh api "repos/$REPO/pulls/$num" --jq '.mergeable_state')
echo " mergeable_state: $state"
if [ "$state" = "behind" ]; then
echo " Branch is behind canon, updating..."
if gh api "repos/$REPO/pulls/$num/update-branch" -X PUT --jq '.message' 2>&1; then
echo " Branch updated. Waiting for mergeability recalculation..."
sleep 10
else
echo " Failed to update branch (may need rebase after CI re-run in next tick)"
fi
fi

echo " Enabling auto-merge..."
gh pr merge "$num" --auto --squash
done
Loading