mirror of
https://github.com/coder/coder.git
synced 2026-09-23 22:20:22 +08:00
## What Consolidates the two separate release programs into a single command at `scripts/releaser`: - `scripts/releaser/v1/` — the former interactive releaser (package `v1`). - `scripts/releaser/v2/` — the former `scripts/release-action` CI tool (package `v2`). - `scripts/releaser/main.go` — new entrypoint. Runs the **v2** tooling by default and the **v1** interactive wizard with `--legacy`. ## CLI shape Three documented subcommands, each backed by v2 `prepare-release` with the release type baked in: - `releaser rc` — tag a release candidate - `releaser branch` — cut a new release branch and tag its first RC - `releaser release` — tag a stable release or patch The former release-action verbs (`calculate-version`, `prepare-release`, `generate-notes`, `publish`) are retained as **hidden** top-level commands with identical flags and stdout, so `tag-and-release.yaml` migrates with a path-only change (`scripts/release-action` -> `scripts/releaser`). `--legacy` runs the v1 wizard and is mutually exclusive with the subcommands. `scripts/release.sh` now launches `releaser --legacy`. All file moves are rename-detected by git, so the per-file diff is just the package declaration. ## Testing - `go build ./scripts/...`, `go vet ./scripts/releaser/...`, `go test ./scripts/releaser/...` - `golangci-lint run ./scripts/releaser/...`, `make lint/emdash`, `shellcheck`, `actionlint` - Smoke: `releaser --help` shows only rc/branch/release; hidden verbs still run; `releaser rc --ref main --dry-run` emits the same JSON contract; `--legacy rc` errors cleanly. <details> <summary>Implementation plan</summary> # Plan: Consolidate release tooling into a single `scripts/releaser` command ## Goal Merge the two separate release programs into one binary at `scripts/releaser`: - `scripts/releaser/v1/` — the current interactive releaser (package `v1`). - `scripts/releaser/v2/` — the current CI `scripts/release-action` (package `v2`). - `scripts/releaser/main.go` — new entrypoint (package `main`). - Uses v2 by default, v1 with `--legacy`. - Exposes 3 subcommands: `rc`, `branch` (cut release branch), `release`. ## Design decision (Option A, chosen) The workflow needs `prepare-release`, `generate-notes`, and `publish` invokable separately (a build happens between prepare and publish). The latter two are version-driven and type-agnostic, so they do not map cleanly onto `rc`/`branch`/`release`. - Visible subcommands `rc`, `branch`, `release` run v2 `prepare-release` with the type baked in and print the same JSON. - Hidden verbs `calculate-version`, `prepare-release`, `generate-notes`, `publish` keep byte-identical flags/stdout, so the workflow change is path-only. Lowest risk; honors "3 subcommands" from a UX perspective. ## `--legacy` semantics - `releaser --legacy` runs the v1 interactive wizard (preserves today's behavior; the wizard auto-detects RC vs release from the branch). - `--legacy` is mutually exclusive with the subcommands (clear error if combined), because v1 auto-detects type and cannot cut a branch. ## Work items 1. Create `v1` and `v2` packages via `git mv`, renaming `package main`. Move the `owner`/`repo` consts into each package. Add `v1.Run(inv, dryRun)` (old wizard `main()` body) and v2 command builders (`CICommands`, `TypeCommand`) so internals stay unexported. 2. New `scripts/releaser/main.go`: top-level `releaser` with `--legacy`, the 3 subcommands, and the hidden compat verbs; delegates to `v1.Run` for legacy. 3. Update references: `tag-and-release.yaml` (3 command paths + header comment) and `scripts/release.sh` (`--legacy`). 4. Verify: build, vet, test, `go run` smoke tests, fmt, lint. 5. Open a single PR from a feature branch. ## Risks / notes - stdout contract for rc/branch/release and the hidden verbs must stay identical (workflow parses stdout); logs go to stderr. - Patch releases from pre-existing `release/X.Y` branches run those branches' own (old) workflow + `scripts/release-action`, so they stay self-consistent. New releases cut from branches containing this change get the new workflow + `scripts/releaser`. No forwarding stub needed since code and workflow ship together. </details> --- This PR was created by Coder Agents on behalf of @f0ssel.
110 lines
3.0 KiB
Go
110 lines
3.0 KiB
Go
package v2
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"os"
|
|
"strings"
|
|
|
|
"golang.org/x/xerrors"
|
|
)
|
|
|
|
// ghOutput runs a gh CLI command and returns trimmed stdout.
|
|
func ghOutput(exec CommandExecutor, args ...string) (string, error) {
|
|
return exec.RunOutput("gh", args...)
|
|
}
|
|
|
|
// pullRequest holds metadata about a GitHub pull request.
|
|
type pullRequest struct {
|
|
Number int
|
|
Title string
|
|
Labels []string
|
|
Author string
|
|
URL string
|
|
}
|
|
|
|
// pullRequestMap holds PR metadata indexed by PR number.
|
|
type pullRequestMap map[int]pullRequest
|
|
|
|
// ghBuildPullRequestMap builds a map of PR number to metadata by
|
|
// querying the GitHub API via the gh CLI for the given PR numbers.
|
|
func ghBuildPullRequestMap(exec CommandExecutor, prNumbers []int) pullRequestMap {
|
|
m := make(pullRequestMap)
|
|
|
|
for _, prNum := range prNumbers {
|
|
out, err := ghOutput(exec, "pr", "view", fmt.Sprintf("%d", prNum),
|
|
"--repo", fmt.Sprintf("%s/%s", owner, repo),
|
|
"--json", "number,labels,author")
|
|
if err != nil {
|
|
_, _ = fmt.Fprintf(os.Stderr, "warning: failed to fetch PR #%d metadata: %v\n", prNum, err)
|
|
continue
|
|
}
|
|
|
|
var result struct {
|
|
Number int `json:"number"`
|
|
Labels []struct {
|
|
Name string `json:"name"`
|
|
} `json:"labels"`
|
|
Author struct {
|
|
Login string `json:"login"`
|
|
} `json:"author"`
|
|
}
|
|
if err := json.Unmarshal([]byte(out), &result); err != nil {
|
|
_, _ = fmt.Fprintf(os.Stderr, "warning: failed to parse PR #%d metadata: %v\n", prNum, err)
|
|
continue
|
|
}
|
|
|
|
var labels []string
|
|
for _, l := range result.Labels {
|
|
labels = append(labels, l.Name)
|
|
}
|
|
|
|
m[result.Number] = pullRequest{
|
|
Number: result.Number,
|
|
Labels: labels,
|
|
Author: result.Author.Login,
|
|
}
|
|
}
|
|
|
|
return m
|
|
}
|
|
|
|
// checkOpenPRs verifies that no pull requests are open against the
|
|
// given branch. If any are found, it returns an error listing them
|
|
// with instructions to merge or close before releasing.
|
|
func checkOpenPRs(exec CommandExecutor, branch string) error {
|
|
out, err := ghOutput(exec, "pr", "list",
|
|
"--repo", fmt.Sprintf("%s/%s", owner, repo),
|
|
"--base", branch,
|
|
"--state", "open",
|
|
"--json", "number,title,author,url",
|
|
"--limit", "100")
|
|
if err != nil {
|
|
return xerrors.Errorf("failed to list open PRs for branch %s: %w", branch, err)
|
|
}
|
|
|
|
var rawPRs []struct {
|
|
Number int `json:"number"`
|
|
Title string `json:"title"`
|
|
Author struct {
|
|
Login string `json:"login"`
|
|
} `json:"author"`
|
|
URL string `json:"url"`
|
|
}
|
|
if err := json.Unmarshal([]byte(out), &rawPRs); err != nil {
|
|
return xerrors.Errorf("failed to parse open PRs response: %w", err)
|
|
}
|
|
|
|
if len(rawPRs) == 0 {
|
|
return nil
|
|
}
|
|
|
|
var b strings.Builder
|
|
_, _ = fmt.Fprintf(&b, "found %d open pull request(s) targeting %s that must be merged or closed before releasing:\n\n", len(rawPRs), branch)
|
|
for _, pr := range rawPRs {
|
|
_, _ = fmt.Fprintf(&b, " - #%d: %s (by @%s)\n %s\n", pr.Number, pr.Title, pr.Author.Login, pr.URL)
|
|
}
|
|
_, _ = fmt.Fprintf(&b, "\nMerge or close these pull requests, then re-run the release workflow.")
|
|
return xerrors.New(b.String())
|
|
}
|