chore: bump recipe-maintainer submodule to 6698723 - recipe-upstream detects the upstream default branch (main vs master) #26

2026-09-21T16:50:39Z

autonomic-bot commented

2026-09-21 16:50:39 +00:00

What: /recipe-upstream (ARM canonical, .claude/commands/recipe-upstream.md) no longer takes the autonomic PR base branch as the upstream PR target. It now detects the upstream repo default branch on git.coopcloud.tech by evidence: (1) git ls-remote --symref origin HEAD, (2) the Gitea API default_branch, (3) the PR base as last-resort fallback with a warning. The detected base drives the compare URL and the post-merge release steps (checkout / ff-only merge / abra recipe release), and a loud warning prints when it differs from the PR base. Also updates the cctest wrapper note in scripts/gen-cctest-skills.py (wrappers regenerated).

Why: repos on git.coopcloud.tech differ - keycloak uses master, and the mirror PR #9 was opened against main, so the previous run emitted main...upgrade-9073e75 compares and git checkout main release steps that would have targeted the wrong branch (the stray-divergent-main trap, previously only documented for gitea).

Evidence: ran the updated script against keycloak PR #9 on the orchestrator host: it detects master (upstream HEAD symref and API agree), prints the base-mismatch warning, and emits compare/master...upgrade-9073e75 + git checkout master / merge --ff-only origin/master release steps. Merge-base check confirms upgrade-9073e75 sits directly on the master line, so the raw branch compares clean - no rebase needed.

Submodule bump: ef3d703 -> 6698723 (recipe-maintainers/autonomic-recipe-maintainer).

**What:** `/recipe-upstream` (ARM canonical, `.claude/commands/recipe-upstream.md`) no longer takes the autonomic PR base branch as the upstream PR target. It now detects the upstream repo default branch on git.coopcloud.tech by evidence: (1) `git ls-remote --symref origin HEAD`, (2) the Gitea API `default_branch`, (3) the PR base as last-resort fallback with a warning. The detected base drives the compare URL **and** the post-merge release steps (checkout / ff-only merge / `abra recipe release`), and a loud warning prints when it differs from the PR base. Also updates the cctest wrapper note in `scripts/gen-cctest-skills.py` (wrappers regenerated). **Why:** repos on git.coopcloud.tech differ - keycloak uses `master`, and the mirror PR #9 was opened against `main`, so the previous run emitted `main...upgrade-9073e75` compares and `git checkout main` release steps that would have targeted the wrong branch (the stray-divergent-`main` trap, previously only documented for gitea). **Evidence:** ran the updated script against keycloak PR #9 on the orchestrator host: it detects `master` (upstream HEAD symref and API agree), prints the base-mismatch warning, and emits `compare/master...upgrade-9073e75` + `git checkout master / merge --ff-only origin/master` release steps. Merge-base check confirms `upgrade-9073e75` sits directly on the master line, so the raw branch compares clean - no rebase needed. Submodule bump: ef3d703 -> 6698723 (recipe-maintainers/autonomic-recipe-maintainer).

autonomic-bot added 1 commit 2026-09-21 16:50:39 +00:00

chore: bump recipe-maintainer submodule to 6698723 — recipe-upstream detects the upstream default branch (main vs master) instead of trusting the PR base 71ca680c86

autonomic-bot merged commit ac73f1b63a into main

2026-09-21 16:50:40 +00:00

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: recipe-maintainers/cc-ci-orchestrator#26