try to fix upload stage

zadorlab · Mar 4, 2024 · 5a6ff92 · 5a6ff92
1 parent 77c4e06
commit 5a6ff92
Showing 1 changed file with 27 additions and 35 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,58 +27,50 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
-          name: wheels-${{ matrix.os }}
+          name: cibw-${{ matrix.os }}-${{ strategy.job-index }}
           path: ./wheelhouse/*.whl
 
-  upload:
-    needs: [build]
+  make_sdist:
+    name: Make SDist
     runs-on: ubuntu-latest
-
     steps:
-    - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
-    - name: Set up Python
-      uses: actions/setup-python@v1
-      with:
-        python-version: '3.12'
+      - name: Set up Python
+        uses: actions/setup-python@v4
 
-    - name: Install dependencies
-      run: |
-        python3 -m pip install --upgrade pip build setuptools cython numpy scipy ase jax jaxlib
-        pip install -r requirements.txt
+      - name: Install dependencies
+        run: |
+          python3 -m pip install --upgrade pip build setuptools cython numpy scipy ase jax jaxlib
+          python3 -m pip install -r requirements.txt
 
-    - name: Create source dist
-      run: python3 -m build --sdist
+      - name: Build SDist
+        run: python3 -m build --sdist
 
-    - name: Stage Linux
-      uses: actions/download-artifact@v4
-      with:
-        name: wheels-ubuntu-latest
-    - run: mv -v wheels-ubuntu-latest/* dist/
+     - uses: action/upload-artifact@v4
+       with:
+         name: cibw-sdist
+         path: dist/*.tar.gz
 
-    - name: Stage Windows
-      uses: actions/download-artifact@v4
-      with:
-        name: wheels-windows-latest
-    - run: mv -v wheels-windows-latest/* dist/
+  upload:
+    needs: [build, make_sdist]
+    runs-on: ubuntu-latest
 
-    - name: Stage MacOS 13
-      uses: actions/download-artifact@v4
+    steps:
+    - uses: actions/download-artifact@v4
       with:
-        name: wheels-macos-13
-    - run: mv -v wheels-macos-13/* dist/
+        pattern: cibw-*
+        path: dist
+        merge-multiple: true
 
-    - name: Stage MacOS 14
-      uses: actions/download-artifact@v4
-      with:
-        name: wheels-macos-14
-    - run: mv -v wheels-macos-14/* dist/
+    - name: Set up Python
+      uses: actions/setup-python@v4
 
     - name: Upload with twine
       env:
         TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
         TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
       run: |
         ls -l dist/*
-        pip install twine
+        python3 -m pip install twine
         twine upload dist/*