From 094ae4a12e90e1ee9aab62e91a2f6e5f9d57377e Mon Sep 17 00:00:00 2001 From: Vadym O Date: Sun, 8 Nov 2026 00:24:33 +0800 Subject: [PATCH] ci: let main releases carry the fork's 2.65.0-vadymhimself.N version release.yml and scripts/release.ts refused any prerelease on main, so the real publish path would reject the fork's own versions even after release-preflight.sh allowed them. Same rule in all three, plus one test pinning it. Ratchet cap for ci-workflows.test.ts raised 5449 -> 5452 for that test. Co-Authored-By: Claude Code --- .github/workflows/release.yml | 3 ++- scripts/release.ts | 3 ++- tests/ci-workflows/ci-workflows.test.ts | 3 +++ tests/fixtures/file-size-baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8857697a6a1..f6853021c99 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -815,7 +815,8 @@ jobs: case "$GITHUB_REF" in refs/heads/main) expected_tag="latest" - if [[ "$RELEASE_VERSION" == *-* ]]; then + # The fork's own releases are 2.65.0-vadymhimself.N and ship from main. + if [[ "$RELEASE_VERSION" == *-* && "$RELEASE_VERSION" != *-vadymhimself.* ]]; then echo "::error::main releases must use a stable semver version; got ${RELEASE_VERSION}" exit 1 fi diff --git a/scripts/release.ts b/scripts/release.ts index 07c84d5ae4e..68ac836e914 100644 --- a/scripts/release.ts +++ b/scripts/release.ts @@ -549,7 +549,8 @@ if (branch === "preview" && !version.includes("-preview.")) { console.error(`Preview releases must use a preview prerelease version (got ${version}).`); process.exit(1); } -if (branch === "main" && version.includes("-")) { +// The fork's own releases are 2.65.0-vadymhimself.N and ship from main. +if (branch === "main" && version.includes("-") && !version.includes("-vadymhimself.")) { console.error(`Main releases must use a stable semver version (got ${version}).`); process.exit(1); } diff --git a/tests/ci-workflows/ci-workflows.test.ts b/tests/ci-workflows/ci-workflows.test.ts index 2e0c8036f8b..3af1b384ac0 100644 --- a/tests/ci-workflows/ci-workflows.test.ts +++ b/tests/ci-workflows/ci-workflows.test.ts @@ -811,6 +811,9 @@ describe("GitHub Actions hardening", () => { expect(workflow).toContain("Release must run from main or preview"); expect(workflow).toContain("main releases must use a stable semver version"); expect(workflow).toContain("preview releases must use a preview prerelease version"); + for (const [f, needle] of [["release.ts", '!version.includes("-vadymhimself.")'], ["ci/release-preflight.sh", "== *-vadymhimself.*"]] as const) + expect(readFileSync(join(repoRoot(), "scripts", f), "utf8")).toContain(needle); // fork 2.65.0-vadymhimself.N ships from main + expect(workflow).toContain('"$RELEASE_VERSION" != *-vadymhimself.*'); const readinessStep = workflow .split("- name: Require dev to be ready for this release")[1] diff --git a/tests/fixtures/file-size-baseline.json b/tests/fixtures/file-size-baseline.json index b567efc952d..0dbd54cf744 100644 --- a/tests/fixtures/file-size-baseline.json +++ b/tests/fixtures/file-size-baseline.json @@ -35,7 +35,7 @@ "src/server/index.ts": 890, "src/server/request-log.ts": 2152, "src/server/responses/core.ts": 210, - "tests/ci-workflows/ci-workflows.test.ts": 5449, + "tests/ci-workflows/ci-workflows.test.ts": 5452, "tests/claude-integration/claude-messages-endpoint.test.ts": 6026, "tests/claude-integration/claude-outbound.test.ts": 2035, "tests/cli/cli-account.test.ts": 2313,