From 09c817a2ec7c0dc4988235aa50b8073192b3e9e2 Mon Sep 17 00:00:00 2001
From: Lysandros Nikolaou <lisandrosnik@gmail.com>
Date: Wed, 17 Jul 2024 23:05:48 +0200
Subject: [PATCH 1/2] Move uploading nightly wheels to different job

This is needed cause the job does not support running on OS's other
than Ubuntu.
---
 .github/workflows/wheels.yml | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 10e37f34387..087d2bd56fd 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -149,13 +149,6 @@ jobs:
           name: dist-${{ matrix.os }}-${{ matrix.cibw_arch }}${{ matrix.manylinux && format('-{0}', matrix.manylinux) }}
           path: ./wheelhouse/*.whl
 
-      - name: Upload wheels to scientific-python-nightly-wheels
-        if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
-        uses: scientific-python/upload-nightly-action@b67d7fcc0396e1128a474d1ab2b48aa94680f9fc # 0.5.0
-        with:
-          artifacts_path: ./wheelhouse
-          anaconda_nightly_upload_token: ${{ secrets.ANACONDA_ORG_UPLOAD_TOKEN }}
-
   windows:
     name: Windows ${{ matrix.cibw_arch }}
     runs-on: windows-latest
@@ -242,13 +235,6 @@ jobs:
           name: fribidi-windows-${{ matrix.cibw_arch }}
           path: winbuild\build\bin\fribidi*
 
-      - name: Upload wheels to scientific-python-nightly-wheels
-        if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
-        uses: scientific-python/upload-nightly-action@b67d7fcc0396e1128a474d1ab2b48aa94680f9fc # 0.5.0
-        with:
-          artifacts_path: ./wheelhouse
-          anaconda_nightly_upload_token: ${{ secrets.ANACONDA_ORG_UPLOAD_TOKEN }}
-
   sdist:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
@@ -269,6 +255,23 @@ jobs:
         name: dist-sdist
         path: dist/*.tar.gz
 
+  scientific-python-nightly-wheels-publish:
+    if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
+    needs: [build-2-native-wheels, windows]
+    runs-on: ubuntu-latest
+    name: Upload release to PyPI
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          pattern: dist-*
+          path: dist
+          merge-multiple: true
+      - name: Upload wheels to scientific-python-nightly-wheels
+        uses: scientific-python/upload-nightly-action@b67d7fcc0396e1128a474d1ab2b48aa94680f9fc # 0.5.0
+        with:
+          artifacts_path: dist
+          anaconda_nightly_upload_token: ${{ secrets.ANACONDA_ORG_UPLOAD_TOKEN }}
+
   pypi-publish:
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
     needs: [build-1-QEMU-emulated-wheels, build-2-native-wheels, windows, sdist]

From a6e93939566619aa1eb10fd5531aa59bb6e39bdc Mon Sep 17 00:00:00 2001
From: Lysandros Nikolaou <lisandrosnik@gmail.com>
Date: Thu, 18 Jul 2024 10:35:09 +0200
Subject: [PATCH 2/2] Update .github/workflows/wheels.yml

Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com>
---
 .github/workflows/wheels.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 087d2bd56fd..ffd1abd953a 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -259,7 +259,7 @@ jobs:
     if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
     needs: [build-2-native-wheels, windows]
     runs-on: ubuntu-latest
-    name: Upload release to PyPI
+    name: Upload wheels to scientific-python-nightly-wheels
     steps:
       - uses: actions/download-artifact@v4
         with: