fix ci

letmaik · Sep 7, 2024 · cfc1f24 · cfc1f24
1 parent 377e452
commit cfc1f24
Showing 1 changed file with 18 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -204,7 +204,7 @@ jobs:
     - name: Store wheels as artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: wheels
+        name: wheel-${{ matrix.config.os-name }}-${{ matrix.config.python-arch }}-${{ matrix.config.python-version }}
         path: dist
 
   test:
@@ -347,7 +347,8 @@ jobs:
     - name: Download wheels from artifact storage
       uses: actions/download-artifact@v4
       with:
-        name: wheels
+        pattern: wheel-*
+        merge-multiple: true
         path: dist
 
     - name: Set up QEMU
@@ -404,7 +405,8 @@ jobs:
     - name: Download wheels from artifact storage
       uses: actions/download-artifact@v4
       with:
-        name: wheels
+        pattern: wheel-*
+        merge-multiple: true
         path: dist
 
     - name: Install from wheel
@@ -416,10 +418,9 @@ jobs:
       run: sphinx-build -b html docs dist-docs
 
     - name: Store docs HTML as artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-pages-artifact@v3
       with:
-        name: docs
-        path: dist-docs
+        path: dist-docs/
 
   publish-wheels:
     runs-on: ubuntu-latest
@@ -432,7 +433,8 @@ jobs:
     - name: Download wheels from artifact storage
       uses: actions/download-artifact@v4
       with:
-        name: wheels
+        pattern: wheel-*
+        merge-multiple: true
         path: dist
 
     - name: Setup Python
@@ -449,19 +451,14 @@ jobs:
     needs: [publish-wheels]
 
     permissions:
-      contents: write
+      pages: write      # to deploy to Pages
+      id-token: write   # to verify the deployment originates from an appropriate source
 
-    steps:
-    - name: Download docs HTML from artifact storage
-      uses: actions/download-artifact@v4
-      with:
-        name: docs
-        path: dist-docs
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
 
-    # TODO replace with https://github.com/actions/deploy-pages once out of beta
-    - name: Upload docs to GitHub Pages
-      uses: peaceiris/actions-gh-pages@47a6d63ea8b47b19328e258563aa1fbe224c0a23
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        PUBLISH_BRANCH: gh-pages
-        PUBLISH_DIR: ./dist-docs
+    steps:
+    - name: Deploy to GitHub Pages
+      id: deployment
+      uses: actions/deploy-pages@v4