From 7045148c703f0d2a229a994b71ad9ac526ee2588 Mon Sep 17 00:00:00 2001 From: Brian O'Kelley Date: Thu, 1 Oct 2026 15:24:43 +0000 Subject: [PATCH 1/2] fix(ci): renumber colliding migration 615 and drop the retired SDK beta tag Main has been red since two merges today, blocking every PR and every deploy since #7833: - #7854 and #7841 both added migration 615. Renumber the later one (reissue_addie_fixed_trace_component_smoke_3_2_ga) to 616. Neither has reached production: no deploy has succeeded since they landed. - npm no longer has a 'beta' dist-tag for @adcp/sdk (removed after 14.0.0 went GA), so 'npm pack @adcp/sdk@beta' fails in the hosted compliance manifest check. Drop it from published-versions.json npm_tags. Co-Authored-By: Claude Opus 5.5 (1M context) --- ...> 616_reissue_addie_fixed_trace_component_smoke_3_2_ga.sql} | 0 ...ixed-trace-component-smoke-private-ledger-migration.test.ts | 2 +- static/compliance/published-versions.json | 3 +-- 3 files changed, 2 insertions(+), 3 deletions(-) rename server/src/db/migrations/{615_reissue_addie_fixed_trace_component_smoke_3_2_ga.sql => 616_reissue_addie_fixed_trace_component_smoke_3_2_ga.sql} (100%) diff --git a/server/src/db/migrations/615_reissue_addie_fixed_trace_component_smoke_3_2_ga.sql b/server/src/db/migrations/616_reissue_addie_fixed_trace_component_smoke_3_2_ga.sql similarity index 100% rename from server/src/db/migrations/615_reissue_addie_fixed_trace_component_smoke_3_2_ga.sql rename to server/src/db/migrations/616_reissue_addie_fixed_trace_component_smoke_3_2_ga.sql diff --git a/server/tests/integration/addie/fixed-trace-component-smoke-private-ledger-migration.test.ts b/server/tests/integration/addie/fixed-trace-component-smoke-private-ledger-migration.test.ts index 3910c4a2ad6..cc554b8f0e0 100644 --- a/server/tests/integration/addie/fixed-trace-component-smoke-private-ledger-migration.test.ts +++ b/server/tests/integration/addie/fixed-trace-component-smoke-private-ledger-migration.test.ts @@ -16,7 +16,7 @@ const REISSUED_583_ADMISSION_FINGERPRINT = '817ab57d30cc89dab4a81016f5c826857b8d const CURRENT_PLAN_MANIFEST_DIGEST = 'bda91890329f1da236a0cddbafa65afe25ff986fb1aa0b04594d2c79d521f70a'; const BASE_LEDGER_MIGRATION = readFileSync(new URL('../../../src/db/migrations/582_addie_fixed_trace_component_smoke_private_ledger.sql', import.meta.url), 'utf8'); const REISSUED_GUARD_MIGRATION = readFileSync(new URL('../../../src/db/migrations/583_reissue_addie_fixed_trace_component_smoke_plan_guard.sql', import.meta.url), 'utf8'); -const GA_REISSUE_MIGRATION = readFileSync(new URL('../../../src/db/migrations/615_reissue_addie_fixed_trace_component_smoke_3_2_ga.sql', import.meta.url), 'utf8'); +const GA_REISSUE_MIGRATION = readFileSync(new URL('../../../src/db/migrations/616_reissue_addie_fixed_trace_component_smoke_3_2_ga.sql', import.meta.url), 'utf8'); async function rejects(statement: string, values: unknown[] = [], subject = client!) { await subject.query('SAVEPOINT private_ledger_expected_failure'); diff --git a/static/compliance/published-versions.json b/static/compliance/published-versions.json index 413cc01cdbb..32092079232 100644 --- a/static/compliance/published-versions.json +++ b/static/compliance/published-versions.json @@ -5,8 +5,7 @@ "npm_tags": [ "adcp-3.0", "latest", - "rc", - "beta" + "rc" ], "package_only_versions": [ "3.0.24", From 872f87d194a8ce1d45e58374e6cbf294a2a9a5ef Mon Sep 17 00:00:00 2001 From: Brian O'Kelley Date: Thu, 1 Oct 2026 15:58:10 +0000 Subject: [PATCH 2/2] test(docs): treat the stable branch as its own docs surface in CI Mirrors the same guard change on 3.2.x so the test stays identical on both branches. Co-Authored-By: Claude Opus 5.5 (1M context) --- tests/docs-nav-validation.test.cjs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/docs-nav-validation.test.cjs b/tests/docs-nav-validation.test.cjs index 623be095b9e..27d19b8d51f 100644 --- a/tests/docs-nav-validation.test.cjs +++ b/tests/docs-nav-validation.test.cjs @@ -333,7 +333,14 @@ test('OpenAPI navigation uses release-pinned public sources', () => { function stableDocsRef() { if (process.env.STABLE_DOCS_REF) return process.env.STABLE_DOCS_REF; const line = /^(\d+\.\d+)$/.exec(defaultVersion)?.[1]; - return line ? `origin/${line}.x` : null; + if (!line) return null; + const branch = `${line}.x`; + // On the stable maintenance branch itself, or a pull request into it, the + // branch is its own release surface. Comparing against its pre-change tip + // would reject every navigation change there, including the GA flip that + // makes it the stable surface. + if ((process.env.GITHUB_BASE_REF || process.env.GITHUB_REF_NAME) === branch) return 'HEAD'; + return `origin/${branch}`; } test('default navigation matches the stable release branch surface', () => {