recipe-maintainers/cc-ci-orchestrator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'chore: bump recipe-maintainer submodule to 6698723 - recipe-upstream detects the upstream default branch (main vs master)' (#26) from recipe-upstream-default-branch into main

Browse Source
This commit was merged in pull request #26.
This commit is contained in:
autonomic-bot
2026-09-21 16:50:40 +00:00
parent a1c37185d8 71ca680c86
commit ac73f1b63a
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.opencode/skills/cctest-recipe-upstream/SKILL.md
+7 -4
View File
@@ -82,7 +82,10 @@ base produces the very messy 3-dot compare this guard exists to prevent (real ca
first "rebase" landed on a stray `main` and had to be redone onto `master`).
**Branch-name mismatch mirror vs upstream.** The mirror and upstream can use different base-branch
names (gitea: mirror `main`, upstream `master`). When emitting step 3 (the post-merge release),
NEVER hardcode `main` — derive the upstream default branch from the existing remotes (`git
remote show origin` or `git ls-remote --symref origin HEAD`) and emit `git checkout <that>;
git fetch origin; git merge --ff-only origin/<that>;` before `abra recipe release`.
names, and a mirror can even carry a stray, divergent `main` alongside the real base (gitea: mirror
PR against `main`, upstream `master`; keycloak PR #9: base `main`, both mirror and upstream on
`master`). The canonical script now detects the upstream default branch by evidence (`git
ls-remote --symref origin HEAD`, then the git.coopcloud.tech API, then the PR base with a warning)
and uses it for the compare URL AND the post-merge release steps — never hardcode `main`, and when
it prints the base-mismatch warning, confirm the upgrade branch actually sits on that line
(`git merge-base` against both candidates) before emitting the push step.
references/recipe-maintainer
+1 -1
Submodule references/recipe-maintainer updated: ef3d70384c...6698723a77
scripts/gen-cctest-skills.py
+7 -4
View File
@@ -110,10 +110,13 @@ base produces the very messy 3-dot compare this guard exists to prevent (real ca
first "rebase" landed on a stray `main` and had to be redone onto `master`).
**Branch-name mismatch mirror vs upstream.** The mirror and upstream can use different base-branch
names (gitea: mirror `main`, upstream `master`). When emitting step 3 (the post-merge release),
NEVER hardcode `main` — derive the upstream default branch from the existing remotes (`git
remote show origin` or `git ls-remote --symref origin HEAD`) and emit `git checkout <that>;
git fetch origin; git merge --ff-only origin/<that>;` before `abra recipe release`.
names, and a mirror can even carry a stray, divergent `main` alongside the real base (gitea: mirror
PR against `main`, upstream `master`; keycloak PR #9: base `main`, both mirror and upstream on
`master`). The canonical script now detects the upstream default branch by evidence (`git
ls-remote --symref origin HEAD`, then the git.coopcloud.tech API, then the PR base with a warning)
and uses it for the compare URL AND the post-merge release steps — never hardcode `main`, and when
it prints the base-mismatch warning, confirm the upgrade branch actually sits on that line
(`git merge-base` against both candidates) before emitting the push step.
""",
}