From a9a0e6e40352746d0c34f2bd92d85169b7da9f2b Mon Sep 17 00:00:00 2001
From: Nicolas Patry <patry.nicolas@protonmail.com>
Date: Mon, 5 Aug 2024 11:32:57 +0200
Subject: [PATCH] Fixing release workflow.

---
 .github/workflows/python-release.yml | 53 +++++++++++++++++-----------
 1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/python-release.yml b/.github/workflows/python-release.yml
index ba11dc74..87ba6133 100644
--- a/.github/workflows/python-release.yml
+++ b/.github/workflows/python-release.yml
@@ -25,7 +25,10 @@ jobs:
     name: build on ${{ matrix.platform || matrix.os }} (${{ matrix.target }} - ${{ matrix.manylinux || 'auto' }})
     # only run on push to main and on release
     needs: [lock_exists]
+
     if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main' || contains(github.event.pull_request.labels.*.name, 'Full Build')
+    outputs:
+      artifact: ${{ steps.artifact-upload-step.outputs.artifact-id }} 
     strategy:
       fail-fast: false
       matrix:
@@ -124,17 +127,17 @@ jobs:
       - run: twine check --strict dist/*
         working-directory: ./bindings/python
 
-      - name: Upload wheels
-        shell: bash
-        run: |
-          pip install awscli
-          aws s3 sync --exact-timestamps ./bindings/python/dist "s3://safetensors-releases/python/$DIST_DIR"
-
-          # - uses: actions/upload-artifact@v3
-          #   working-directory: ./bindings/python/
-          #   with:
-          #     name: pypi_files
-          #     path: dist
+          # - name: Upload wheels
+          #   shell: bash
+          #   run: |
+          #     pip install awscli
+          #     aws s3 sync --exact-timestamps ./bindings/python/dist "s3://safetensors-releases/python/$DIST_DIR"
+
+      - uses: actions/upload-artifact@v4
+        id: artifact-upload-step
+        with:
+          name: pypi_files-${{ matrix.os }}-${{ matrix.target }}-${{ matrix.manylinux }}
+          path: bindings/python/dist
   build-sdist:
     name: build sdist
     needs: [lock_exists]
@@ -147,11 +150,15 @@ jobs:
           command: sdist
           args: --out dist
           rust-toolchain: stable
-      - name: Upload wheels
-        shell: bash
-        run: |
-          pip install awscli
-          aws s3 sync --exact-timestamps ./bindings/python/dist "s3://safetensors-releases/python/$DIST_DIR"
+            # - name: Upload wheels
+            #   shell: bash
+            #   run: |
+            #     pip install awscli
+            #     aws s3 sync --exact-timestamps ./bindings/python/dist "s3://safetensors-releases/python/$DIST_DIR"
+      - uses: actions/upload-artifact@v4
+        with:
+          name: pypi_files-src
+          path: ./bindings/python/dist
 
 
   upload_package:
@@ -168,11 +175,15 @@ jobs:
           python-version: "3.12"
           architecture: x64
 
-      - name: Retrieve all wheels
-        shell: bash
-        run: |
-          pip install awscli
-          aws s3 sync "s3://safetensors-releases/python/$DIST_DIR" ./bindings/python/dist
+            # - name: Retrieve all wheels
+            #   shell: bash
+            #   run: |
+            #     pip install awscli
+            #     aws s3 sync "s3://safetensors-releases/python/$DIST_DIR" ./bindings/python/dist
+      - uses: actions/download-artifact@v4
+        with:
+          path: ./bindings/python/dist
+          merge-multiple: true
 
       - name: Upload to PyPi
         working-directory: ./bindings/python