From 1ead2742758d16bdf99b119c78a74d5673ff803c Mon Sep 17 00:00:00 2001
From: ijl <ijl@mailbox.org>
Date: Wed, 27 Mar 2024 23:15:40 +0000
Subject: [PATCH] Fix upload-artifact, download-artifact workflow

---
 .github/workflows/linux.yaml | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml
index 98f6c0b2..a78b3c81 100644
--- 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"