Merge pull request #1 from jenskeiner/feature/fix-pypi-detection

Correctly detect when package appears in the PyPI index.
jenskeiner · Aug 17, 2023 · 83cb8ae · 83cb8ae
2 parents f46c414 + 38fbdf3
commit 83cb8ae
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/publish-rc.yml b/.github/workflows/publish-rc.yml
@@ -56,14 +56,16 @@ jobs:
         n=60
         exists=0
         while [ $i -lt $n ] && [ $exists -eq 0 ]; do
-            if curl -s https://test.pypi.org/pypi/${{ env.PACKAGE_NAME }}/json | jq -e '.releases | has("${{ env.VERSION }}")' &> /dev/null; then
+            if curl -s https://test.pypi.org/pypi/${{ env.PACKAGE_NAME }}/json | jq -e ".releases | has(\"${{ env.VERSION }}\")"; then
+                echo "$i/$n Package exists in index."
                 exists=1
             else
                 ((i++))
-                echo "$i/$n Waiting for package to appear in test index, sleeping 5s."
+                echo "$i/$n Package has not appeared in index yet. Sleeping 5s."
                 sleep 5s
             fi
         done
+        sleep 5s
         pip install --no-cache-dir --index-url https://test.pypi.org/simple ${{ env.PACKAGE_NAME }}==${{ env.VERSION }} --no-deps
         pip install -r requirements.txt
         python -c 'import ${{ env.MODULE_NAME }};print(${{ env.MODULE_NAME }}.__version__)'
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -53,14 +53,16 @@ jobs:
         n=60
         exists=0
         while [ $i -lt $n ] && [ $exists -eq 0 ]; do
-            if curl -s https://test.pypi.org/pypi/${{ env.PACKAGE_NAME }}/json | jq -e '.releases | has("${{ env.VERSION }}")' &> /dev/null; then
+            if curl -s https://test.pypi.org/pypi/${{ env.PACKAGE_NAME }}/json | jq -e ".releases | has(\"${{ env.VERSION }}\")"; then
+                echo "$i/$n Package exists in index."
                 exists=1
             else
                 ((i++))
-                echo "$i/$n Waiting for package to appear in test index, sleeping 5s."
+                echo "$i/$n Package has not appeared in index yet. Sleeping 5s."
                 sleep 5s
             fi
         done
+        sleep 5s
         pip install --no-cache-dir --index-url https://test.pypi.org/simple ${{ env.PACKAGE_NAME }}==${{ env.VERSION }} --no-deps
         pip install -r requirements.txt
         python -c 'import ${{ env.MODULE_NAME }};print(${{ env.MODULE_NAME }}.__version__)'
@@ -76,13 +78,15 @@ jobs:
         n=60
         exists=0
         while [ $i -lt $n ] && [ $exists -eq 0 ]; do
-            if curl -s https://pypi.org/pypi/${{ env.PACKAGE_NAME }}/json | jq -e '.releases | has("${{ env.VERSION }}")' &> /dev/null; then
+            if curl -s https://pypi.org/pypi/${{ env.PACKAGE_NAME }}/json | jq -e ".releases | has(\"${{ env.VERSION }}\")"; then
+                echo "$i/$n Package exists in index."
                 exists=1
             else
                 ((i++))
-                echo "$i/$n Waiting for package to appear in test index, sleeping 5s."
+                echo "$i/$n Package has not appeared in index yet. Sleeping 5s."
                 sleep 5s
             fi
         done
+        sleep 5s
         pip install --no-cache-dir --index-url https://pypi.org/simple ${{ env.PACKAGE_NAME }}==${{ env.VERSION }}
         python -c 'import ${{ env.MODULE_NAME }};print(${{ env.MODULE_NAME }}.__version__)'