Skip to content

ci: create release tags and branches with the release App after approval (#32212) (conflicts) - #32217

Merged
kylecarbs merged 1 commit into
release/2.29from
backport/32212-to-2.29
Nov 16, 2026
Merged

kylecarbs merged 1 commit into
release/2.29from
backport/32212-to-2.29

Conversation

@coder-backporter-app

Copy link
Copy Markdown

Backport of #32212

Original PR: #32212 — ci: create release tags and branches with the release App after approval
Merge commit: 12766ec
Requested by: @kylecarbs

Warning

The automatic cherry-pick had conflicts.
Please resolve manually by cherry-picking the original merge commit:

git fetch origin backport/32212-to-2.29
git checkout backport/32212-to-2.29
git reset --hard origin/release/2.29
git cherry-pick -x -m1 12766eca93b9d05c4588aebfda7ef64a260d79c1
# resolve conflicts, then push

@coder-backporter-app coder-backporter-app Bot added the backport/v2.29 Backport PR targeting release/2.29 label Nov 16, 2026
@github-actions

Copy link
Copy Markdown
Contributor

👋 Hey @coder-backporter-app[bot]!

This PR is targeting the release/2.29 release branch, but its title does not start with fix: or fix(scope):.

Only bug fixes should be cherry-picked to release branches. If this is a bug fix, please update the PR title to match the conventional commit format:

fix: description of the bug fix
fix(scope): description of the bug fix

If this is not a bug fix, it likely should not target a release branch.

…val (#32212)

**Unblocks releases after the `coder/coder` lockdown.** Only the
`coder-release-publisher` App can now create tags and release branches
(rulesets "Release tags (App only)" and "Release branch creation",
managed in `coder/github-org-terraform`). Its key is only available in
environments that need a **second release manager's approval**
(`release-managers`, no self-review, no admin bypass). People can't push
release tags anymore, so the tag is now created **inside the approved
release run**.

1. Run `./scripts/release.sh` on `release/X.Y` (or `main` for an RC), as
today. It still picks the version, checks open PRs and breaking changes,
and writes the release notes.
2. Instead of creating and pushing the tag, it checks the commit is
already on `origin/<branch>` and dispatches `release.yaml` **on the
branch** with `version`, `commit`, `release_channel` and
`release_notes`.
3. The releaser prints the run's URL. GitHub also notifies the
`release-managers` reviewers. **Another release manager approves** the
run's `release` environment (Review deployments).
4. The approved job creates the annotated tag `version` at `commit` with
the App, then builds, signs and publishes that commit as before.

`release.yaml` can also be run by hand from the Actions UI with the same
inputs.

- New `version` and `commit` inputs (required unless `dry_run`).
- The `release` job checks out `commit`. Before anything else, it:
  - refuses a malformed version;
- refuses a version that doesn't match the branch (`release/X.Y`, or
`main`/`release/X.Y` for `-rc.N`);
  - refuses a commit that isn't already on the dispatched branch;
  - refuses an existing tag that points elsewhere;
- otherwise creates the annotated tag with the App. A re-run reuses a
tag already at that commit.

  `version.sh` and the rest of the job are unchanged.
- **Homebrew and the `coder/packages` dispatch use the new
`coder-package-publisher` App** (`release-publish` environment) instead
of `CDRCI_GITHUB_TOKEN`. The dispatch moves to its own
`publish-packages` job in `release-publish`, where that key lives; it's
approved together with Homebrew and winget. Winget still uses the
`cdrci` machine user, since an App can't open PRs on
`microsoft/winget-pkgs`.
- Every App token is scoped to one repository and the permissions it
needs (`zizmor`'s `github-app` audit: 5 high findings to 0, one of which
predates this PR).

Dispatched on `main` with `version` (e.g. `2.40`) and `commit`. After
approval in the `release-refs` environment, it creates `release/X.Y` at
that commit, refusing one that isn't on `main` or a branch that already
exists.

- `ReleaseExecutor` drops `CreateTag`/`PushTag`.
- `TriggerWorkflow` dispatches on the branch with `version` and
`commit`.
- An existing tag must already point at HEAD.
- After dispatching, it looks up the run (`gh run list`, polling
briefly) and prints its URL and the approval steps.

- [ ] `RELEASE_APP_ID` and `RELEASE_APP_PRIVATE_KEY` set in the
**`release-refs`** environment (currently empty), and the rotated
release App key in `release`.
- [x] `CODER_PACKAGE_PUBLISHER_APP_ID` /
`CODER_PACKAGE_PUBLISHER_APP_PRIVATE_KEY` in `release-publish`; App
installed on `homebrew-coder` and `packages`.

`release.yaml` runs from the dispatched branch's own copy, and
`./scripts/release.sh` runs the branch's releaser. So **each
`release/X.Y` needs this change before it can release**. Active lines by
recent tags: `release/2.39`, `2.38`, `2.37`, `2.36`, `2.35`, `2.34`,
`2.29`.

PR is the smaller change that unblocks releases now. #31321 can build on
it: its tagging job would need `environment: release-refs` (where the
App key lives) plus the extra App permissions it asks for, which are a
manifest change in `coder/github-org-terraform` `apps/`.

- `go build`, `go vet`, `go test ./scripts/releaser` pass.
- `actionlint` and `zizmor` are clean on both workflows.
- Not exercised end to end. Suggest the first use be an RC
(`v2.40.0-rc.N` from `main`), watching the tag step.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
(cherry picked from commit 12766ec)
@kylecarbs

Copy link
Copy Markdown
Member

Resolved the cherry-pick by hand (5df11f9ae42). release/2.29 predates main's RC handling, so in "Verify release input" it keeps its simpler release-branch check, with the one change from #32212: the branch must contain refs/tags/${INPUT_VERSION} (the tag the approved job creates) instead of GITHUB_REF. The packages dispatch step drops its own if: !inputs.dry_run, since its new publish-packages job already has it. The releaser applied cleanly; go build, go vet, go test ./scripts/releaser, actionlint and zizmor pass on this branch.

@kylecarbs
kylecarbs merged commit 99d9610 into release/2.29 Nov 16, 2026
25 checks passed
@kylecarbs
kylecarbs deleted the backport/32212-to-2.29 branch November 16, 2026 01:15
@linear-code

linear-code Bot commented Nov 16, 2026

Copy link
Copy Markdown

SEC-1436

This branch had an error being deployed

1 failed deployment
docs-preview — 5df11f9a Deployed Nov 16, 2026 by kylecarbs via cleanup #77
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport/v2.29 Backport PR targeting release/2.29

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants