Skip to content

Fix /deploy computing release contents against a stale local production branch #214

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
sebastientaggart merged 1 commit into from
Aug 6, 2026
Merged

Fix /deploy computing release contents against a stale local production branch #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions .agents/skills/deploy/SKILL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,11 @@ Find the latest version tag (`git describe --tags --abbrev=0`; if none, note thi

Show the merge commits (and their PRs) since the last tag. The range depends on the mode:

Fetch `main` first — Step 1 only synced the deploy branch, so the local `main` ref may lag `origin/main`. Comparing against a stale local `main` over-reports the release (it re-lists already-promoted PRs and already-closed issues). Compute the range against the freshly-fetched remote ref:

```bash
git log main..<deploy-branch> --merges --pretty=format:"%s"
git fetch origin main
git log origin/main..<deploy-branch> --merges --pretty=format:"%s"
```

Merge-commit subjects have the form `Merge pull request #N from branch/name` — parse the PR numbers, then retrieve each body with `gh pr view <N> --json number,title,body`.
Expand Down Expand Up @@ -173,4 +176,4 @@ Note the release URL from the output.
## Step 8 — Report

Tell the user: "Released vX.Y.Z. Linked issues are closed. GitHub Release vX.Y.Z created at `<url>`. Run `make deploy-prod` to ship to production."
<!-- generated by CodeCannon/sync.py | skill: deploy | adapter: codex | hash: 10153e09 | DO NOT EDIT — run CodeCannon/sync.py to regenerate -->
<!-- generated by CodeCannon/sync.py | skill: deploy | adapter: codex | hash: 40c52023 | DO NOT EDIT — run CodeCannon/sync.py to regenerate -->
7 changes: 5 additions & 2 deletions .claude/commands/deploy.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,11 @@ Find the latest version tag (`git describe --tags --abbrev=0`; if none, note thi

Show the merge commits (and their PRs) since the last tag. The range depends on the mode:

Fetch `main` first — Step 1 only synced the deploy branch, so the local `main` ref may lag `origin/main`. Comparing against a stale local `main` over-reports the release (it re-lists already-promoted PRs and already-closed issues). Compute the range against the freshly-fetched remote ref:

```bash
git log main..<deploy-branch> --merges --pretty=format:"%s"
git fetch origin main
git log origin/main..<deploy-branch> --merges --pretty=format:"%s"
```

Merge-commit subjects have the form `Merge pull request #N from branch/name` — parse the PR numbers, then retrieve each body with `gh pr view <N> --json number,title,body`.
Expand Down Expand Up @@ -168,4 +171,4 @@ Note the release URL from the output.
## Step 8 — Report

Tell the user: "Released vX.Y.Z. Linked issues are closed. GitHub Release vX.Y.Z created at `<url>`. Run `make deploy-prod` to ship to production."
<!-- generated by CodeCannon/sync.py | skill: deploy | adapter: claude | hash: 8f580805 | DO NOT EDIT — run CodeCannon/sync.py to regenerate -->
<!-- generated by CodeCannon/sync.py | skill: deploy | adapter: claude | hash: 7cbe2969 | DO NOT EDIT — run CodeCannon/sync.py to regenerate -->
7 changes: 5 additions & 2 deletions .cursor/rules/deploy.mdc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,11 @@ Find the latest version tag (`git describe --tags --abbrev=0`; if none, note thi

Show the merge commits (and their PRs) since the last tag. The range depends on the mode:

Fetch `main` first — Step 1 only synced the deploy branch, so the local `main` ref may lag `origin/main`. Comparing against a stale local `main` over-reports the release (it re-lists already-promoted PRs and already-closed issues). Compute the range against the freshly-fetched remote ref:

```bash
git log main..<deploy-branch> --merges --pretty=format:"%s"
git fetch origin main
git log origin/main..<deploy-branch> --merges --pretty=format:"%s"
```

Merge-commit subjects have the form `Merge pull request #N from branch/name` — parse the PR numbers, then retrieve each body with `gh pr view <N> --json number,title,body`.
Expand Down Expand Up @@ -174,4 +177,4 @@ Note the release URL from the output.
## Step 8 — Report

Tell the user: "Released vX.Y.Z. Linked issues are closed. GitHub Release vX.Y.Z created at `<url>`. Run `make deploy-prod` to ship to production."
<!-- generated by CodeCannon/sync.py | skill: deploy | adapter: cursor | hash: ab16e157 | DO NOT EDIT — run CodeCannon/sync.py to regenerate -->
<!-- generated by CodeCannon/sync.py | skill: deploy | adapter: cursor | hash: f5e7f32e | DO NOT EDIT — run CodeCannon/sync.py to regenerate -->
7 changes: 5 additions & 2 deletions .gemini/skills/deploy/SKILL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,11 @@ Find the latest version tag (`git describe --tags --abbrev=0`; if none, note thi

Show the merge commits (and their PRs) since the last tag. The range depends on the mode:

Fetch `main` first — Step 1 only synced the deploy branch, so the local `main` ref may lag `origin/main`. Comparing against a stale local `main` over-reports the release (it re-lists already-promoted PRs and already-closed issues). Compute the range against the freshly-fetched remote ref:

```bash
git log main..<deploy-branch> --merges --pretty=format:"%s"
git fetch origin main
git log origin/main..<deploy-branch> --merges --pretty=format:"%s"
```

Merge-commit subjects have the form `Merge pull request #N from branch/name` — parse the PR numbers, then retrieve each body with `gh pr view <N> --json number,title,body`.
Expand Down Expand Up @@ -173,4 +176,4 @@ Note the release URL from the output.
## Step 8 — Report

Tell the user: "Released vX.Y.Z. Linked issues are closed. GitHub Release vX.Y.Z created at `<url>`. Run `make deploy-prod` to ship to production."
<!-- generated by CodeCannon/sync.py | skill: deploy | adapter: gemini | hash: 904fbcdf | DO NOT EDIT — run CodeCannon/sync.py to regenerate -->
<!-- generated by CodeCannon/sync.py | skill: deploy | adapter: gemini | hash: 6218edc6 | DO NOT EDIT — run CodeCannon/sync.py to regenerate -->
5 changes: 4 additions & 1 deletion skills/github-agile/deploy.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,11 @@ git log <latest-tag>..HEAD --merges --pretty=format:"%s"
```
{{/if}}
{{#if BRANCH_DEV}}
Fetch `{{BRANCH_PROD}}` first — Step 1 only synced the deploy branch, so the local `{{BRANCH_PROD}}` ref may lag `origin/{{BRANCH_PROD}}`. Comparing against a stale local `{{BRANCH_PROD}}` over-reports the release (it re-lists already-promoted PRs and already-closed issues). Compute the range against the freshly-fetched remote ref:

```bash
git log {{BRANCH_PROD}}..<deploy-branch> --merges --pretty=format:"%s"
git fetch origin {{BRANCH_PROD}}
git log origin/{{BRANCH_PROD}}..<deploy-branch> --merges --pretty=format:"%s"
```
{{#if BRANCH_TEST}}
Some merges here may be promotion merges from `{{BRANCH_DEV}}` (subjects matching "Merge ... from `{{BRANCH_DEV}}`"). Include them, but extract the original feature PRs from their PR bodies where possible.
Expand Down
Loading