From 38cac95593c2a35cbf935b8db4514df3835adb6e Mon Sep 17 00:00:00 2001 From: Jeremi Joslin Date: Sun, 1 Nov 2026 20:07:01 +0700 Subject: [PATCH] fix: build the release canary manifest with its components member Since 0.44.0 the candidate validator requires `components` on every stack candidate at or after the first rstack release. The canary seals a 1.2.3 manifest but never built that member, so every scheduled run stopped at "manifest has a non-closed schema: missing components". The canary now derives the member from its placeholder payloads with rstack_components.py, as release-candidate.yml does, and a structure test ties the requirement to the canary version. Signed-off-by: Jeremi Joslin --- .github/workflows/release-canary.yml | 6 ++++- .../test_release_workflow_structure.py | 24 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-canary.yml b/.github/workflows/release-canary.yml index ba6dc0fe7d..0dcb4d7a3e 100644 --- a/.github/workflows/release-canary.yml +++ b/.github/workflows/release-canary.yml @@ -149,6 +149,8 @@ jobs: encoding="utf-8", ) PY + python3 release/scripts/rstack_components.py --version "${version}" \ + < canary/payloads.json > canary/components.json for name in "${image_names[@]}"; do jq -n \ --arg name "${name}" \ @@ -199,6 +201,7 @@ jobs: --slurpfile payloads canary/payloads.json \ --slurpfile images canary/images.json \ --slurpfile scans canary/scans.json \ + --slurpfile components canary/components.json \ '{ schema_version: "registry-stack.release-candidate.v2", repository: $repository, @@ -238,7 +241,8 @@ jobs: name: ("registry-stack-" + $tag + "-candidate.tar.gz"), size: $bundle_size, sha256: $bundle_sha - } + }, + components: $components[0] }' > canary/candidate-manifest.draft.json python3 release/scripts/release_candidate.py seal-candidate \ --draft canary/candidate-manifest.draft.json \ diff --git a/release/scripts/test_release_workflow_structure.py b/release/scripts/test_release_workflow_structure.py index 92e5f250b3..ccef005d31 100644 --- a/release/scripts/test_release_workflow_structure.py +++ b/release/scripts/test_release_workflow_structure.py @@ -3375,6 +3375,30 @@ def test_canary_is_async_and_has_no_public_write_permission(self) -> None: self.assertIn("docs: {", text) self.assertNotIn("docs-dispatch", text) + def test_canary_manifest_carries_components_from_the_first_rstack_release( + self, + ) -> None: + # The candidate validator requires `components` on every stack + # candidate at or after the first rstack release, so a canary + # version past that release must build the member the same way + # release-candidate.yml does. + _, document = workflow("release-canary.yml") + script = "\n".join( + step.get("run", "") + for job in document["jobs"].values() + for step in job.get("steps", []) + ) + version = re.search(r"^version=(\d+)\.(\d+)\.(\d+)$", script, re.M) + self.assertIsNotNone(version) + canary_version = tuple(int(part) for part in version.groups()) + self.assertIsNotNone(release_roster.RSTACK_FIRST_RELEASE) + self.assertGreaterEqual(canary_version, release_roster.RSTACK_FIRST_RELEASE) + self.assertIn( + 'python3 release/scripts/rstack_components.py --version "${version}"', + script, + ) + self.assertIn("components: $components[0]", script) + def test_scorecard_is_schedule_or_manual_only(self) -> None: text, _ = workflow("scorecard.yml") trigger = text.split("permissions:", 1)[0]