ci: support registry cleanup during publish

Author: fffonion

.github/workflows/publish-crates.yml

@@ -15,6 +15,10 @@ on:
         description: 'Compatible pd-host-function version. Defaults to 0.22.7.'
         required: false
         type: string
+      yank_pd_host_function_version:
+        description: 'Optional pd-host-function version to yank before publishing.'
+        required: false
+        type: string
 
 concurrency:
   group: publish-crates-${{ github.ref }}
@@ -43,13 +47,19 @@ jobs:
           CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
           INPUT_VERSION: ${{ inputs.version }}
           INPUT_HOST_VERSION: ${{ inputs.pd_host_function_version }}
+          INPUT_YANK_HOST_VERSION: ${{ inputs.yank_pd_host_function_version }}
         run: |
           set -euo pipefail
           version="${INPUT_VERSION:-${GITHUB_REF_NAME#v}}"
           if [[ -z "$version" ]]; then
             echo "version is required" >&2
             exit 1
           fi
-          python3 scripts/publish_crates.py \
-            --version "$version" \
+          args=(
+            --version "$version"
             --host-version "${INPUT_HOST_VERSION:-0.22.7}"
+          )
+          if [[ -n "${INPUT_YANK_HOST_VERSION:-}" ]]; then
+            args+=(--yank-host-version "$INPUT_YANK_HOST_VERSION")
+          fi
+          python3 scripts/publish_crates.py "${args[@]}"

scripts/publish_crates.py

@@ -28,6 +28,10 @@ def publish_plan(release_version: str, host_version: str) -> list[tuple[str, str
     return [(package, versions[package]) for package in PACKAGE_ORDER]
 
 
+def yank_command(package: str, version: str) -> list[str]:
+    return ["cargo", "yank", "--vers", version, package]
+
+
 def _rewrite_dependency_versions(text: str, versions: dict[str, str]) -> str:
     dependency_re = re.compile(r"^(\s*([A-Za-z0-9_-]+)\s*=\s*\{)(.*)(\}\s*)$")
     output = []
@@ -156,6 +160,7 @@ def main() -> None:
     parser.add_argument("--host-version", default="0.22.7")
     parser.add_argument("--root", type=Path, default=Path.cwd())
     parser.add_argument("--prepare-only", action="store_true")
+    parser.add_argument("--yank-host-version")
     args = parser.parse_args()
 
     root = args.root.resolve()
@@ -167,6 +172,13 @@ def main() -> None:
     if not os.environ.get("CARGO_REGISTRY_TOKEN"):
         raise SystemExit("CARGO_REGISTRY_TOKEN is required")
 
+    if args.yank_host_version:
+        subprocess.run(
+            yank_command("pd-host-function", args.yank_host_version),
+            cwd=root,
+            check=True,
+        )
+
     for package, version in plan:
         if crate_exists(package, version):
             print(f"{package} {version} already published; skipping", flush=True)

scripts/test_publish_crates.py

@@ -50,6 +50,12 @@ def test_rewrite_manifests_applies_release_and_dependency_versions(self) -> None
             self.assertIn('vm = { package = "pd-vm", path = "..", version = "0.23.1" }', nostd_manifest)
             self.assertIn('version = "0.23.1"', alias_manifest)
 
+    def test_yank_command_targets_requested_host_version(self) -> None:
+        self.assertEqual(
+            publish_crates.yank_command("pd-host-function", "0.23.0"),
+            ["cargo", "yank", "--vers", "0.23.0", "pd-host-function"],
+        )
+
     def test_publish_plan_uses_dependency_order_and_per_package_versions(self) -> None:
         self.assertEqual(
             publish_crates.publish_plan("0.23.1", "0.22.7"),