Skip to content

fix(release): verify main promotions by content, not merge-commit message #2551

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
namastex888 merged 2 commits into from
Jul 11, 2026
Merged

fix(release): verify main promotions by content, not merge-commit message #2551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4915087
fix(release): verify main promotions by content, not merge-commit mes…
namastex888 Jul 11, 2026
07734b3
fix(lint): format codex plugin.json — dev tree biome-red again
namastex888 Jul 11, 2026
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
52 changes: 43 additions & 9 deletions .github/workflows/version.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,16 @@ jobs:
github.event.workflow_run.event == 'push' &&
!contains(github.event.workflow_run.head_commit.message, '[auto-version]') &&
(
(github.event.workflow_run.head_branch == 'main' &&
startsWith(github.event.workflow_run.head_commit.message, 'Merge pull request') &&
contains(github.event.workflow_run.head_commit.message, '/dev'))
||
(github.event.workflow_run.head_branch == 'homolog' &&
startsWith(github.event.workflow_run.head_commit.message, 'Merge pull request') &&
contains(github.event.workflow_run.head_commit.message, '/dev'))
||
(github.event.workflow_run.head_branch == 'main') ||

@chatgpt-codex-connector chatgpt-codex-connector Bot Jul 11, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Scope the auto-version skip away from rebase promotions

This new main promotion path is still nested under the job-level !contains(..., '[auto-version]') guard above. The dev bump step creates the dev tip as chore(version): ... [auto-version], so when the dev→main PR is rebase-merged and that rebased bump commit becomes the push head, workflow_run.head_commit.message contains [auto-version] and the entire job is skipped before Verify dev promotion can do the content check. In that merge mode, the stable dispatch still never fires; scope the auto-version skip to the dev bump path or otherwise let main promotions reach the promotion gate.

Useful? React with 👍 / 👎.

(github.event.workflow_run.head_branch == 'homolog') ||
(github.event.workflow_run.head_branch == 'dev')
))
# main/homolog promotion is verified by the "Verify dev promotion" STEP
# below (merge-commit message OR content match against dev), not by a
# message-only expression here. Message-only gating silently skipped the
# stable release whenever a dev→main PR was rebase- or squash-merged
# (observed #2537 2026-07-09 and #2542 2026-07-10: main advanced, stable
# .well-known stayed stale, clients downgraded).

steps:
- name: Determine branch and version prefix
Expand Down Expand Up @@ -121,6 +121,40 @@ jobs:
fetch-depth: 0
token: ${{ secrets.GITHUB_TOKEN }}

# Promotion gate for the no-bump (main/homolog) path. A promotion is a
# push whose head commit is a dev merge commit ("Merge pull request …
# /dev") OR whose content equals dev's tip — the latter is what a
# rebase- or squash-merged dev→main PR produces (no merge commit, so
# message checks can never see it). `.well-known` is excluded from the
# content diff: release-publish commits channel manifests to main only,
# so a rebased promotion's tree always differs from dev exactly there.
# If dev advanced past the PR head before this runs, the content check
# misses and we skip with a notice — the next promotion catches up
# (same posture as the atomic tag-push race below).
- name: Verify dev promotion (main/homolog no-bump path)
id: promotion
if: steps.context.outputs.should_bump == 'false'
run: |
SUBJECT="$(git show -s --format=%s HEAD)"
PROMOTED=false
REASON="not a dev promotion"
if printf '%s' "${SUBJECT}" | grep -q '^Merge pull request' && printf '%s' "${SUBJECT}" | grep -q '/dev'; then
PROMOTED=true
REASON="dev merge commit"
else
git fetch origin dev --quiet
if git diff --quiet origin/dev HEAD -- ':(exclude).well-known'; then
PROMOTED=true
REASON="content matches dev tip (rebase/squash promotion)"
fi
fi
echo "promoted=${PROMOTED}" >> "$GITHUB_OUTPUT"
if [ "${PROMOTED}" = "true" ]; then
echo "Promotion verified: ${REASON}"
else
echo "::notice ::release-trigger.promotion_unverified head commit is neither a dev merge commit nor content-identical to dev — stable/homolog dispatch skipped"
fi

- uses: oven-sh/setup-bun@v2
with:
bun-version: "1.3.10"
Expand Down Expand Up @@ -249,7 +283,7 @@ jobs:
# advances. This is the ONLY code path that publishes the stable
# channel; without it a main merge produces no stable release.
- name: Trigger release pipeline for the promoted tag (stable/homolog)
if: steps.context.outputs.should_bump == 'false'
if: steps.context.outputs.should_bump == 'false' && steps.promotion.outputs.promoted == 'true'
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
Expand Down
19 changes: 3 additions & 16 deletions plugins/genie/.codex-plugin/plugin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,13 @@
"homepage": "https://github.com/automagik-dev/genie",
"repository": "https://github.com/automagik-dev/genie",
"license": "MIT",
"keywords": [
"workflow",
"orchestration",
"codex",
"skills",
"agents"
],
"keywords": ["workflow", "orchestration", "codex", "skills", "agents"],
"skills": "./skills/",
"hooks": "./hooks/codex-hooks.json",
"mcpServers": {
"genie": {
"command": "genie",
"args": [
"mcp"
]
"args": ["mcp"]
}
},
"interface": {
Expand All @@ -32,12 +24,7 @@
"longDescription": "First-class Genie workflows for Codex, including shared skills, lifecycle hooks, MCP task state, and role-specific subagents.",
"developerName": "Namastex Labs",
"category": "Developer Tools",
"capabilities": [
"Skills",
"Hooks",
"MCP",
"Subagents"
],
"capabilities": ["Skills", "Hooks", "MCP", "Subagents"],
"websiteURL": "https://github.com/automagik-dev/genie",
"defaultPrompt": [
"Use $wish to turn this request into an executable plan.",
Expand Down
Loading