Fix upload-artifact, download-artifact workflow

ijl · Mar 27, 2024 · 1ead274 · 1ead274
1 parent 11c7de8
commit 1ead274
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml
@@ -40,11 +40,12 @@ jobs:
     - run: ./integration/run typestubs
 
     - name: Store sdist
-      if: "startsWith(github.ref, 'refs/tags/')"
+      # if: "startsWith(github.ref, 'refs/tags/')"
       uses: actions/upload-artifact@v4
       with:
-        name: wheels
+        name: orjson_sdist
         path: dist
+        overwrite: true
         retention-days: 1
 
   manylinux_2_17_amd64:
@@ -101,11 +102,12 @@ jobs:
     - run: ./integration/run init
 
     - name: Store wheels
-      if: "startsWith(github.ref, 'refs/tags/')"
+      # if: "startsWith(github.ref, 'refs/tags/')"
       uses: actions/upload-artifact@v4
       with:
-        name: wheels
+        name: orjson_manylinux_2_17_amd64_${{ matrix.python.version }}
         path: dist
+        overwrite: true
         retention-days: 1
 
   musllinux_1_2:
@@ -175,11 +177,12 @@ jobs:
           venv/bin/python -m pytest -s -rxX -v test
 
     - name: Store wheels
-      if: "startsWith(github.ref, 'refs/tags/')"
+      # if: "startsWith(github.ref, 'refs/tags/')"
       uses: actions/upload-artifact@v4
       with:
-        name: wheels
+        name: orjson_musllinux_1_2_${{ matrix.platform.arch }}_${{ matrix.python.version }}
         path: dist
+        overwrite: true
         retention-days: 1
 
   manylinux_2_17_non_amd64:
@@ -270,22 +273,24 @@ jobs:
           venv/bin/python -m pytest -s -rxX -v -n 2 test
 
     - name: Store wheels
-      if: "startsWith(github.ref, 'refs/tags/')"
+      # if: "startsWith(github.ref, 'refs/tags/')"
       uses: actions/upload-artifact@v4
       with:
-        name: wheels
+        name: orjson_manylinux_2_17_${{ matrix.target.arch }}_${{ matrix.python.version }}
         path: dist
+        overwrite: true
         retention-days: 1
 
   pypi:
     name: PyPI
     runs-on: ubuntu-22.04
-    if: "startsWith(github.ref, 'refs/tags/')"
+    # if: "startsWith(github.ref, 'refs/tags/')"
     needs: [ manylinux_2_17_amd64, manylinux_2_17_non_amd64, musllinux_1_2, sdist ]
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: wheels
+          pattern: orjson_*
+          merge-multiple: true
       - uses: actions/setup-python@v5
         with:
           python-version: "3.11"