Merge pull request #345 from getlogbook/fix/pypi-publish

Fix PyPI publish
getlogbook · Jul 30, 2023 · 81a1db9 · 81a1db9
2 parents fa36a8e + 2d47101
commit 81a1db9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml
@@ -31,9 +31,16 @@ jobs:
       - name: Download artifacts
         uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615 # v2.27.0
         with:
-          path: dist/
+          path: artifacts/
           run_id: ${{ github.event.inputs.run_id || github.event.workflow_run.id }}
 
+      - name: Move artifacts to dist/
+        run: |
+          ls -lR artifacts/
+          mkdir dist
+          mv artifacts/sdist/*.tar.gz dist/
+          mv artifacts/wheels/*.whl dist/
+
       - name: Publish to pypi.org
         uses: pypa/gh-action-pypi-publish@f8c70e705ffc13c3b4d1221169b84f12a75d6ca8 # v1.8.8
         if: github.event_name == 'workflow_run' || (github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'pypi')

diff --git a/.github/workflows/wheel-builder.yml b/.github/workflows/wheel-builder.yml
@@ -8,7 +8,7 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: The version (tag) to build
+        description: The Git ref to build
   # Do not add any non-tag push events without updating pypi-publish.yml. If
   # you do, it'll upload wheels to PyPI.
   push: