From 7cd0dd028997b6d3eab53705d9e818a0419c17c8 Mon Sep 17 00:00:00 2001
From: Mark Gee <jw.ziggee@gmail.com>
Date: Mon, 20 Jul 2026 11:50:56 +0100
Subject: [PATCH] ci: make publish idempotent for re-runs

Tag step skips if the tag already exists; PyPI publish uses skip-existing;
GitHub release uploads assets with --clobber if the release already exists.
Lets the publish be safely re-dispatched (e.g. after a conda-token fix) without
failing on the already-created tag / already-published version.
---
 .github/workflows/release-publish.yml | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index 784d5ec..7ac71de 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -46,12 +46,16 @@ jobs:
       - name: Resolve version + create tag
         id: resolve
         run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           TAG="v$(jq -r '."."' .release-please-manifest.json)"
           echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
-          git tag -a "${TAG}" -m "${TAG}"
-          git push origin "${TAG}"
+          if git rev-parse -q --verify "refs/tags/${TAG}" >/dev/null; then
+            echo "Tag ${TAG} already exists; skipping tag creation (re-run)."
+          else
+            git config user.name "github-actions[bot]"
+            git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+            git tag -a "${TAG}" -m "${TAG}"
+            git push origin "${TAG}"
+          fi
 
       - name: Set up conda (conda-build + anaconda-client)
         uses: conda-incubator/setup-miniconda@v3
@@ -101,6 +105,8 @@ jobs:
           path: dist/
       - name: Publish to PyPI (OIDC)
         uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          skip-existing: true # idempotent on re-run
 
   conda:
     needs: build
@@ -154,7 +160,12 @@ jobs:
           else
             notes="Release ${TAG}"
           fi
-          gh release create "${TAG}" \
-            --title "${TAG}" \
-            --notes "${notes}" \
-            dist/*.whl dist/*.tar.gz dist/*.conda
+          if gh release view "${TAG}" >/dev/null 2>&1; then
+            echo "Release ${TAG} exists; uploading assets (re-run)."
+            gh release upload "${TAG}" dist/*.whl dist/*.tar.gz dist/*.conda --clobber
+          else
+            gh release create "${TAG}" \
+              --title "${TAG}" \
+              --notes "${notes}" \
+              dist/*.whl dist/*.tar.gz dist/*.conda
+          fi