Skip to content

Commit bb85566

Browse files
committed
ci: target testing branch for auto-merge group PRs
auto-merge group (brew, common, extensions, etc.) should land on testing first — no review gate — and flow to main via weekly promotion. This unblocks auto-merge which was stuck because main requires 1 review. manual-merge and core-junctions still target main (require human review). Assisted-by: Claude Sonnet 4.6 via pi
1 parent f6e8678 commit bb85566

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

.github/workflows/track-bst-sources.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,14 +239,22 @@ jobs:
239239
echo "*Generated by [Track BuildStream Sources](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})*"
240240
} > /tmp/pr-body.md
241241
242+
# auto-merge PRs target testing (no review gate, auto-merges to main via promotion).
243+
# manual-merge PRs target main (require human review).
244+
BASE_BRANCH="main"
245+
if [ "${{ matrix.group }}" = "auto-merge" ]; then
246+
BASE_BRANCH="testing"
247+
fi
248+
242249
EXISTING_PR=$(gh pr list --head "$BRANCH" --json number --jq '.[0].number' 2>/dev/null || true)
243250
if [ -n "$EXISTING_PR" ]; then
244251
echo "Updating existing PR #$EXISTING_PR"
245252
gh pr edit "$EXISTING_PR" --title "$TITLE" --body-file /tmp/pr-body.md
253+
gh pr edit "$EXISTING_PR" --base "$BASE_BRANCH" 2>/dev/null || true
246254
PR_URL=$(gh pr view "$EXISTING_PR" --json url --jq '.url')
247255
else
248256
PR_URL=$(gh pr create \
249-
--base main \
257+
--base "$BASE_BRANCH" \
250258
--head "$BRANCH" \
251259
--title "$TITLE" \
252260
--body-file /tmp/pr-body.md)

0 commit comments

Comments
 (0)