From fc23da7adf2b75f9ad6e649667bcc9a92c53ced3 Mon Sep 17 00:00:00 2001
From: Eric Hibbs <e.m.hibbs@gmail.com>
Date: Thu, 7 Nov 2024 12:26:36 -0800
Subject: [PATCH] made release workflow idempotent

---
 .github/workflows/release.yml | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index bdcfed8..1004ce6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,18 +29,33 @@ jobs:
           VERSION: ${{ env.VERSION }}
         run: |
           if curl -s -f https://pypi.org/pypi/socketsecurity/$VERSION/json > /dev/null; then
-            echo "Error: Version ${VERSION} already exists on PyPI"
-            exit 1
+            echo "Version ${VERSION} already exists on PyPI"
+            echo "pypi_exists=true" >> $GITHUB_OUTPUT
+          else
+            echo "Version ${VERSION} not found on PyPI - proceeding with PyPI deployment"
+            echo "pypi_exists=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Check Docker image existence
+        id: docker_check
+        env:
+          VERSION: ${{ env.VERSION }}
+        run: |
+          if curl -s -f "https://hub.docker.com/v2/repositories/socketdev/cli/tags/${{ env.VERSION }}" > /dev/null; then
+            echo "Docker image socketdev/cli:${VERSION} already exists"
+            echo "docker_exists=true" >> $GITHUB_OUTPUT
           else
-            echo "Version ${VERSION} not found on PyPI - proceeding with release"
+            echo "docker_exists=false" >> $GITHUB_OUTPUT
           fi
 
       - name: Build package
+        if: steps.version_check.outputs.pypi_exists != 'true'
         run: |
           pip install build
           python -m build
 
       - name: Publish to PyPI
+        if: steps.version_check.outputs.pypi_exists != 'true'
         uses: pypa/gh-action-pypi-publish@v1.8.11
         with:
           password: ${{ secrets.PYPI_TOKEN }}
@@ -51,7 +66,7 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Verify package is available
+      - name: Verify package is installable
         id: verify_package
         env:
           VERSION: ${{ env.VERSION }}
@@ -70,7 +85,9 @@ jobs:
           exit 1
 
       - name: Build & Push Docker
-        if: steps.verify_package.outputs.success == 'true'
+        if: |
+          steps.verify_package.outputs.success == 'true' &&
+          steps.docker_check.outputs.docker_exists != 'true'
         uses: docker/build-push-action@v5
         env:
           VERSION: ${{ env.VERSION }}