ci: 🎡 add step to organize dist for pypi release

darvid · Aug 8, 2023 · 9921c97 · 9921c97
1 parent 21dcfb5
commit 9921c97
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -25,6 +25,12 @@ jobs:
           branch: main
           run_id: ${{ github.event.workflow_run.id }}
 
+      - name: Prepare dist
+        run: |
+          mkdir -p dist
+          mv ./wheel-*/*.whl dist/
+          mv ./sdist/*.tar.gz dist/
+
       - uses: pdm-project/setup-pdm@v3
         with:
           python-version: "3.11"

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -176,23 +176,23 @@ jobs:
           python-version: "3.11"
           cache: true
 
+      - name: Install build tooling
+        run: |
+          pdm install -G build -G release --no-self --no-lock -v
+
       - name: Get current version
         id: current_version
         run: |
-          version=$(python setup.py --version 2>/dev/null | tail -n1)
+          version=$(pdm run -m setuptools_scm --strip-dev)
           echo "version=${version}" >> "$GITHUB_OUTPUT"
 
-      - name: Install build tooling
-        run: |
-          pdm install -G build -G release --no-self --no-lock -v
-
       - name: Increment version
         run: pdm run semantic-release version --no-commit
 
       - name: Get next version
         id: next_version
         run: |
-          version=$(python setup.py --version 2>/dev/null | tail -n1)
+          version=$(pdm run -m setuptools_scm --strip-dev)
           echo "version=${version}" >> "$GITHUB_OUTPUT"
 
       - name: Build source distribution