Move pypi-release task into package.yml

metabrainz · Feb 4, 2025 · 893dca5 · 893dca5
1 parent a417ed8
commit 893dca5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/.github/workflows/package-pypi.yml b/.github/workflows/package-pypi.yml
@@ -115,27 +115,3 @@ jobs:
         name: picard-bdist-${{ runner.os }}-${{ matrix.python-version }}
         path: dist/*.whl
 
-  pypi-release:
-    runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/')
-    needs:
-      - pypi-bdist
-      - pypi-sdist
-    environment:
-      name: pypi
-      url: https://pypi.org/p/picard
-    permissions:
-      id-token: write  # required for PyPI upload
-    steps:
-    - uses: actions/download-artifact@v4
-      with:
-        pattern: picard-?dist*
-        path: dist/
-        merge-multiple: true
-    - name: Prepare distributions
-      run: |
-        ls -l dist/
-        # Remove zip source distribution (only a single sdist is allowed)
-        rm dist/picard-*.zip*
-    - name: Publish package distributions to PyPI
-      uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -45,6 +45,30 @@ jobs:
     permissions:
       id-token: write
 
+  pypi-release:
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/')
+    needs:
+      - package-pypi
+    environment:
+      name: pypi
+      url: https://pypi.org/p/picard
+    permissions:
+      id-token: write  # required for PyPI upload
+    steps:
+    - uses: actions/download-artifact@v4
+      with:
+        pattern: picard-?dist*
+        path: dist/
+        merge-multiple: true
+    - name: Prepare distributions
+      run: |
+        ls -l dist/
+        # Remove zip source distribution (only a single sdist is allowed)
+        rm dist/picard-*.zip*
+    - name: Publish package distributions to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
+
   github-release:
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/')