Fix release workflow

MagicStack · Oct 18, 2024 · ed20321 · ed20321
1 parent 7ee30e9
commit ed20321
Showing 1 changed file with 19 additions and 8 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -39,8 +39,8 @@ jobs:
 
     - uses: actions/upload-artifact@v4
       with:
-        name: dist
-        path: dist/
+        name: dist-version
+        path: dist/VERSION
 
   build-sdist:
     needs: validate-release-request
@@ -67,7 +67,7 @@ jobs:
 
     - uses: actions/upload-artifact@v4
       with:
-        name: dist
+        name: dist-sdist
         path: dist/*.tar.*
 
   build-wheels-matrix:
@@ -127,9 +127,17 @@ jobs:
 
     - uses: actions/upload-artifact@v4
       with:
-        name: dist
+        name: dist-wheels
         path: wheelhouse/*.whl
 
+  merge-artifacts:
+    runs-on: ubuntu-latest
+    needs: [build-sdist, build-wheels]
+    steps:
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+        name: dist
+
   publish-docs:
     needs: [build-sdist, build-wheels]
     runs-on: ubuntu-latest
@@ -180,6 +188,12 @@ jobs:
     needs: [build-sdist, build-wheels, publish-docs]
     runs-on: ubuntu-latest
 
+    environment:
+      name: pypi
+      url: https://pypi.org/p/asyncpg
+    permissions:
+      id-token: write
+
     steps:
     - uses: actions/checkout@v4
       with:
@@ -223,7 +237,4 @@ jobs:
     - name: Upload to PyPI
       uses: pypa/gh-action-pypi-publish@release/v1
       with:
-        user: __token__
-        password: ${{ secrets.PYPI_TOKEN }}
-        # password: ${{ secrets.TEST_PYPI_TOKEN }}
-        # repository_url: https://test.pypi.org/legacy/
+        attestations: true