mirror of
https://github.com/outbackdingo/optimclaw.git
synced 2026-08-26 15:40:18 +00:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6e972863e7 |
@@ -406,6 +406,10 @@ jobs:
|
|||||||
echo "passed=true" >> "$GITHUB_OUTPUT"
|
echo "passed=true" >> "$GITHUB_OUTPUT"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Only merge PRs targeting main. Chained PRs (targeting another
|
||||||
|
# promotion branch) stay open — when the base PR merges into main,
|
||||||
|
# GitHub auto-retargets the chained PR. Merging chained PRs would
|
||||||
|
# trigger delete_branch_on_merge, auto-closing downstream PRs.
|
||||||
- name: Merge promotion PR
|
- name: Merge promotion PR
|
||||||
id: merge
|
id: merge
|
||||||
if: steps.evaluate.outputs.passed == 'true'
|
if: steps.evaluate.outputs.passed == 'true'
|
||||||
@@ -414,12 +418,15 @@ jobs:
|
|||||||
PR_NUMBER: ${{ needs.create-promotion-pr.outputs.pr_number }}
|
PR_NUMBER: ${{ needs.create-promotion-pr.outputs.pr_number }}
|
||||||
run: |
|
run: |
|
||||||
if [ -n "$PR_NUMBER" ]; then
|
if [ -n "$PR_NUMBER" ]; then
|
||||||
echo "Merging promotion PR #${PR_NUMBER}"
|
BASE=$(gh pr view "$PR_NUMBER" --json baseRefName --jq '.baseRefName')
|
||||||
# Do NOT use --delete-branch: deleting a promotion branch closes
|
if [ "$BASE" = "main" ]; then
|
||||||
# any chained PRs that use it as their base (verified in ironclaw-ci-test).
|
echo "Merging promotion PR #${PR_NUMBER} (targets main)"
|
||||||
# Stale promotion branches are cleaned up separately.
|
gh pr merge "$PR_NUMBER" --merge
|
||||||
gh pr merge "$PR_NUMBER" --merge
|
echo "merged=true" >> "$GITHUB_OUTPUT"
|
||||||
echo "merged=true" >> "$GITHUB_OUTPUT"
|
else
|
||||||
|
echo "PR #${PR_NUMBER} targets '${BASE}' (not main) — leaving open for chain resolution"
|
||||||
|
echo "merged=false" >> "$GITHUB_OUTPUT"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# ── Update tested tag (always, so next batch covers only new commits) ──
|
# ── Update tested tag (always, so next batch covers only new commits) ──
|
||||||
@@ -437,7 +444,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
with:
|
with:
|
||||||
ref: staging
|
ref: staging
|
||||||
fetch-depth: 1
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: Update staging-tested tag
|
- name: Update staging-tested tag
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
Reference in New Issue
Block a user