From a82ed1f61b785623e00a6288cfcd213f5534a826 Mon Sep 17 00:00:00 2001
From: Aaron Stopher <22336995+aastopher@users.noreply.github.com>
Date: Thu, 30 Jan 2025 12:12:02 -0700
Subject: [PATCH] resolve file conflict

---
 .github/workflows/release-python.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml
index 2cf420f..3e9b497 100644
--- a/.github/workflows/release-python.yml
+++ b/.github/workflows/release-python.yml
@@ -109,7 +109,7 @@ jobs:
       - name: Upload sdist artifact
         uses: actions/upload-artifact@v4
         with:
-          name: sdist
+          name: sdist-${{ github.run_id }}
           path: target/wheels/*.tar.gz
           compression-level: 9
           overwrite: true
@@ -189,7 +189,7 @@ jobs:
       - name: Upload wheel artifact
         uses: actions/upload-artifact@v4
         with:
-          name: wheels
+          name: wheels-${{ github.run_id }}
           path: target/wheels/*.whl        
           compression-level: 9
           overwrite: true
@@ -234,8 +234,8 @@ jobs:
       - name: Merge all wheels and source distributions into `output/`
         run: |
           mkdir -p output
-          mv root/wheels/*.whl output/
-          mv root/sdist/*.tar.gz output/
+          mv root/wheels-${{ github.run_id }}/*.whl output/ || true
+          mv root/sdist-${{ github.run_id }}/*.tar.gz output/ || true
           ls -l output/
 
       - name: Dry run output