From 781014a2e963103a327bffc5e6b1b794cd06be90 Mon Sep 17 00:00:00 2001
From: Matthew Treinish <mtreinish@kortar.org>
Date: Tue, 17 Oct 2023 15:44:50 -0400
Subject: [PATCH] Use shared upload job for all jobs that use non-linux

---
 .github/workflows/wheels.yml | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 08c89af18..0a1c2885a 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -23,7 +23,7 @@ jobs:
     environment: release
     permissions:
       id-token: write
-    needs: ["build_wheels", "build-win32-wheels"]
+    needs: ["upload_shared_wheels"]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -43,8 +43,6 @@ jobs:
     name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     environment: release
-    permissions:
-      id-token: write
     strategy:
       fail-fast: false
       matrix:
@@ -65,10 +63,23 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           path: ./wheelhouse/*.whl
+          name: shared-wheel-builds
+  upload_shared_wheels:
+    name: Upload shared build wheels
+    runs-on: ubuntu-latest
+    environment: release
+    permissions:
+      id-token: write
+    needs: ["build_wheels", "build-mac-arm-wheels", "build-win32-wheels"]
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: shared-wheel-builds
+          path: deploy
       - name: Publish package distributions to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          packages-dir: wheelhouse/
+          packages-dir: deploy
   build_wheels_aarch64:
     name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
@@ -295,8 +306,6 @@ jobs:
     name: Build wheels on macos for arm and universal2
     runs-on: macos-latest
     environment: release
-    permissions:
-      id-token: write
     steps:
       - uses: actions/checkout@v3
       - name: Build wheels
@@ -309,16 +318,11 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           path: ./wheelhouse/*.whl
-      - name: Publish package distributions to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          packages-dir: wheelhouse/
+          name: shared-wheel-builds
   build-win32-wheels:
     name: Build wheels on win32
     runs-on: windows-latest
     environment: release
-    permissions:
-      id-token: write
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -342,17 +346,14 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           path: ./wheelhouse/*.whl
-      - name: Publish package distributions to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          packages-dir: wheelhouse/
+          name: shared-wheel-builds
   retworkx-compat-build:
     name: Build retworkx
     runs-on: ubuntu-latest
     environment: release
     permissions:
       id-token: write
-    needs: ["build_wheels", "build-win32-wheels"]
+    needs: ["upload_shared_wheels"]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4