Fix publication promotion retry finalization

Author: MaxGhenis

.github/scripts/promote_publication_pipeline.py

@@ -59,16 +59,19 @@ def _promotion_context_from_status(context: RunContext, status: dict) -> RunCont
         raise RuntimeError("Run manifest is missing candidate_version.")
     if not release_bump:
         raise RuntimeError("Run manifest is missing release_bump.")
+    release_version = _manifest_field(manifest, "release_version")
+    if not release_version:
+        release_version = release_version_from_bump(
+            _current_package_version(),
+            release_bump,
+        )
     return RunContext.from_mapping(
         manifest.get("run_context"),
         run_id=context.run_id,
         modal_app_name=context.modal_app_name,
         modal_environment=context.modal_environment,
         candidate_version=candidate_version,
-        release_version=release_version_from_bump(
-            _current_package_version(),
-            release_bump,
-        ),
+        release_version=release_version,
         base_release_version=base_release_version,
         release_bump=release_bump,
     )

.github/scripts/restore_publication_changelog.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import filecmp
+import json
 import os
 import shutil
 import sys
@@ -11,6 +12,7 @@
 
 REPO_ROOT = Path(__file__).resolve().parents[2]
 ROOT_CHANGELOG_DIR = REPO_ROOT / "changelog.d"
+PUBLICATION_SCOPE_PATH = REPO_ROOT / ".github" / "publication_scope.json"
 PUBLICATION_CANDIDATES_DIR = REPO_ROOT / ".github" / "publication_candidates"
 CHANGELOG_KEEP_FILE = ".gitkeep"
 
@@ -53,16 +55,61 @@ def _validate_root_fragments_match_snapshot(
         )
 
 
+def _publication_scope() -> dict[str, str]:
+    if not PUBLICATION_SCOPE_PATH.exists():
+        return {}
+    return json.loads(PUBLICATION_SCOPE_PATH.read_text())
+
+
+def _scope_matches_environment(scope: dict[str, str]) -> bool:
+    expected = {
+        "candidate_scope": os.environ.get("US_DATA_CANDIDATE_VERSION")
+        or os.environ.get("CANDIDATE_VERSION"),
+        "base_release_version": os.environ.get("US_DATA_BASE_RELEASE_VERSION")
+        or os.environ.get("BASE_RELEASE_VERSION"),
+        "release_bump": os.environ.get("US_DATA_RELEASE_BUMP")
+        or os.environ.get("RELEASE_BUMP"),
+    }
+    return all(
+        not value or not scope.get(key) or scope[key] == value
+        for key, value in expected.items()
+    )
+
+
+def _snapshot_dir(run_id: str) -> Path:
+    return PUBLICATION_CANDIDATES_DIR / run_id / "changelog.d"
+
+
+def _resolve_snapshot_dir(run_id: str) -> Path:
+    requested_dir = _snapshot_dir(run_id)
+    if _fragments(requested_dir):
+        return requested_dir
+
+    scope = _publication_scope()
+    scope_run_id = scope.get("run_id", "")
+    if scope_run_id and scope_run_id != run_id and _scope_matches_environment(scope):
+        scope_dir = _snapshot_dir(scope_run_id)
+        if _fragments(scope_dir):
+            print(
+                "No changelog snapshot found for promotion run "
+                f"{run_id}; using publication scope snapshot {scope_run_id}.",
+            )
+            return scope_dir
+
+    details = (
+        f"No candidate changelog fragments found for run {run_id}: {requested_dir}"
+    )
+    if scope_run_id and scope_run_id != run_id:
+        details += f"; publication scope points to {scope_run_id}: {_snapshot_dir(scope_run_id)}"
+    raise RuntimeError(details)
+
+
 def restore_candidate_changelog(run_id: str) -> Path:
     if not run_id:
         raise RuntimeError("US_DATA_RUN_ID is required to restore changelog fragments.")
 
-    snapshot_dir = PUBLICATION_CANDIDATES_DIR / run_id / "changelog.d"
+    snapshot_dir = _resolve_snapshot_dir(run_id)
     snapshot_fragments = _fragments(snapshot_dir)
-    if not snapshot_fragments:
-        raise RuntimeError(
-            f"No candidate changelog fragments found for run {run_id}: {snapshot_dir}"
-        )
 
     ROOT_CHANGELOG_DIR.mkdir(parents=True, exist_ok=True)
     root_fragments = _fragments(ROOT_CHANGELOG_DIR)

tests/unit/test_publication_scripts.py

@@ -406,6 +406,42 @@ def test_restore_publication_changelog_restores_candidate_snapshot(
     assert (root_changelog / "123.changed.md").read_text() == "Changed a thing.\n"
 
 
+def test_restore_publication_changelog_falls_back_to_scope_snapshot(
+    tmp_path,
+    monkeypatch,
+):
+    module = _load_script(
+        ".github/scripts/restore_publication_changelog.py",
+        "restore_publication_changelog_scope_fallback_test",
+    )
+    root_changelog = tmp_path / "changelog.d"
+    publication_dir = tmp_path / ".github" / "publication_candidates"
+    snapshot = publication_dir / "versioning-run" / "changelog.d"
+    snapshot.mkdir(parents=True)
+    (snapshot / "123.changed.md").write_text("Changed a thing.\n")
+    scope_path = tmp_path / ".github" / "publication_scope.json"
+    scope_path.write_text(
+        json.dumps(
+            {
+                "base_release_version": "1.115.3",
+                "candidate_scope": "1.115.3-patch",
+                "release_bump": "patch",
+                "run_id": "versioning-run",
+            }
+        )
+    )
+    monkeypatch.setenv("US_DATA_CANDIDATE_VERSION", "1.115.3-patch")
+    monkeypatch.setenv("US_DATA_BASE_RELEASE_VERSION", "1.115.3")
+    monkeypatch.setenv("US_DATA_RELEASE_BUMP", "patch")
+    monkeypatch.setattr(module, "ROOT_CHANGELOG_DIR", root_changelog)
+    monkeypatch.setattr(module, "PUBLICATION_SCOPE_PATH", scope_path)
+    monkeypatch.setattr(module, "PUBLICATION_CANDIDATES_DIR", publication_dir)
+
+    module.restore_candidate_changelog("pipeline-run")
+
+    assert (root_changelog / "123.changed.md").read_text() == "Changed a thing.\n"
+
+
 def test_restore_publication_changelog_rejects_unrelated_root_fragments(
     tmp_path,
     monkeypatch,
@@ -650,6 +686,49 @@ def from_name(app_name, function_name, **kwargs):
     assert "VERSION_OVERRIDE" not in json.dumps(captured["calls"])
 
 
+def test_promote_publication_script_prefers_manifest_release_version(
+    tmp_path,
+    monkeypatch,
+):
+    monkeypatch.setitem(
+        sys.modules,
+        "modal",
+        types.SimpleNamespace(Function=types.SimpleNamespace()),
+    )
+    module = _load_script(
+        ".github/scripts/promote_publication_pipeline.py",
+        "promote_publication_pipeline_release_version_test",
+    )
+    _write_pyproject(tmp_path, "1.74.0")
+    monkeypatch.setattr(module, "_REPO_ROOT", tmp_path)
+    context = module.RunContext.from_mapping(
+        {"run_id": "run-123"},
+        modal_app_name="app",
+        modal_environment="main",
+    )
+
+    promoted_context = module._promotion_context_from_status(
+        context,
+        {
+            "run_manifest": {
+                "run_id": "run-123",
+                "candidate_version": "1.73.0-minor",
+                "base_release_version": "1.73.0",
+                "release_bump": "minor",
+                "release_version": "1.74.0",
+                "run_context": {
+                    "run_id": "run-123",
+                    "candidate_version": "1.73.0-minor",
+                    "base_release_version": "1.73.0",
+                    "release_bump": "minor",
+                },
+            }
+        },
+    )
+
+    assert promoted_context.release_version == "1.74.0"
+
+
 def test_promote_publication_script_requires_release_bump(
     tmp_path,
     monkeypatch,