Skip to content

Fix promotion workflow to use auto-merge for branch protection #57

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
Its-donkey merged 1 commit into from
Feb 6, 2026
+30 −8
Merged

Fix promotion workflow to use auto-merge for branch protection #57

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
38 changes: 30 additions & 8 deletions .github/workflows/release-promotion.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,18 @@ jobs:

echo "✅ Added PR #${PR_NUMBER} link to CHANGELOG.md"

- name: Auto-merge PR and create tag
- name: Enable auto-merge on PR
if: ${{ github.event.inputs.auto_merge == 'true' }}
env:
PR_NUMBER: ${{ steps.pr.outputs.number }}
GH_TOKEN: ${{ github.token }}
run: |
set -euo pipefail
echo "🔄 Enabling auto-merge on PR #${PR_NUMBER}..."
gh pr merge "$PR_NUMBER" --auto --merge --delete-branch=false
echo "✅ Auto-merge enabled - PR will merge when status checks pass"

- name: Wait for PR to merge and create tag
if: ${{ github.event.inputs.auto_merge == 'true' }}
env:
TAG_NAME: ${{ steps.version.outputs.tag }}
Expand All @@ -271,15 +282,26 @@ jobs:
run: |
set -euo pipefail

echo "🔄 Merging PR #${PR_NUMBER}..."

# Wait for any status checks to complete
sleep 5
echo "⏳ Waiting for PR #${PR_NUMBER} to merge..."
TIMEOUT=600
ELAPSED=0
INTERVAL=15

# Merge the PR
gh pr merge "$PR_NUMBER" --merge --delete-branch=false
while [ "$ELAPSED" -lt "$TIMEOUT" ]; do
STATE=$(gh pr view "$PR_NUMBER" --json state --jq '.state')
if [ "$STATE" = "MERGED" ]; then
echo "✅ PR #${PR_NUMBER} merged to $TARGET_BRANCH"
break
fi
echo " PR state: $STATE (${ELAPSED}s elapsed, checking again in ${INTERVAL}s)"
sleep "$INTERVAL"
ELAPSED=$((ELAPSED + INTERVAL))
done

echo "✅ PR #${PR_NUMBER} merged to $TARGET_BRANCH"
if [ "$STATE" != "MERGED" ]; then
echo "❌ Timed out waiting for PR to merge after ${TIMEOUT}s"
exit 1
fi

# Fetch latest target branch
git fetch origin "$TARGET_BRANCH"
Expand Down