From 2fba6ba802e4bc487b692c9f7960e8a38f8c96d7 Mon Sep 17 00:00:00 2001
From: Kyle Edwards <kyedwards@nvidia.com>
Date: Wed, 5 Mar 2025 13:59:59 -0500
Subject: [PATCH 1/3] Move publish step out of `wheels-build.yaml`

Follow-up to https://github.com/NVIDIA/numba-cuda/pull/142#issuecomment-2701214971
---
 .github/workflows/pr.yaml           | 19 +++++++++++++++++++
 .github/workflows/publish.yaml      | 21 ++++++++++++++++++++-
 .github/workflows/wheels-build.yaml | 26 --------------------------
 3 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 8ef0c4ebb..f37581375 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -77,6 +77,25 @@ jobs:
       build_type: pull-request
       script: "ci/build_wheel.sh"
       matrix_filter: ${{ needs.compute-matrix.outputs.BUILD_MATRIX }}
+  # TODO: Remove this job before merging
+  fake-publish-wheels:
+    needs: build-wheels
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download sdist
+        if: "!cancelled()"
+        uses: actions/download-artifact@v4
+        with:
+          name: sdist
+          path: dist
+      - name: Download wheel
+        if: "!cancelled()"
+        uses: actions/download-artifact@v4
+        with:
+          name: wheel
+          path: dist
+      - name: List wheels
+        run: ls dist/
   test-wheels:
     needs:
       - build-wheels
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 064e7e709..80fdb5886 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -41,7 +41,26 @@ jobs:
       build_type: release
       script: "ci/build_wheel.sh"
       matrix_filter: ${{ needs.compute-matrix.outputs.BUILD_MATRIX }}
-      upload_to_pypi: true
+  publish-wheels:
+    needs: build-wheels
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download sdist
+        if: "!cancelled()"
+        uses: actions/download-artifact@v4
+        with:
+          name: sdist
+          path: dist
+      - name: Download wheel
+        if: "!cancelled()"
+        uses: actions/download-artifact@v4
+        with:
+          name: wheel
+          path: dist
+      - name: Publish wheel
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          password: ${{ secrets.RAPIDSAI_PYPI_TOKEN }}
   build-docs:
     needs:
       - build-conda
diff --git a/.github/workflows/wheels-build.yaml b/.github/workflows/wheels-build.yaml
index e895f3b5b..f887de3ef 100644
--- a/.github/workflows/wheels-build.yaml
+++ b/.github/workflows/wheels-build.yaml
@@ -45,10 +45,6 @@ on:
         type: string
         default: ''
 
-      upload_to_pypi:
-        type: boolean
-        required: false
-
 defaults:
   run:
     shell: bash
@@ -173,25 +169,3 @@ jobs:
         with:
           name: wheel
           path: ${{ env.wheel_path }}
-
-  publish:
-    needs: [build]
-    runs-on: ubuntu-latest
-    if: inputs.upload_to_pypi
-    steps:
-      - name: Download sdist
-        if: "!cancelled()"
-        uses: actions/download-artifact@v4
-        with:
-          name: sdist
-          path: dist
-      - name: Download wheel
-        if: "!cancelled()"
-        uses: actions/download-artifact@v4
-        with:
-          name: wheel
-          path: dist
-      - name: Publish wheel
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          password: ${{ secrets.RAPIDSAI_PYPI_TOKEN }}

From 6e03ae2fd0bfa4acb1599dac5070aa4bf647c27f Mon Sep 17 00:00:00 2001
From: Kyle Edwards <kyedwards@nvidia.com>
Date: Wed, 5 Mar 2025 14:03:40 -0500
Subject: [PATCH 2/3] s/mambabuild/build/

---
 ci/build_conda.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/build_conda.sh b/ci/build_conda.sh
index c4b86beca..fae201ca4 100755
--- a/ci/build_conda.sh
+++ b/ci/build_conda.sh
@@ -13,7 +13,7 @@ rapids-print-env
 
 rapids-logger "Begin py build"
 
-rapids-conda-retry mambabuild conda/recipes/numba-cuda
+rapids-conda-retry build conda/recipes/numba-cuda
 
 package_path=(/tmp/conda-bld-output/noarch/numba-cuda-*.tar.bz2)
 echo "package_path=$package_path" >> $GITHUB_ENV

From d97a389a45fe8c148684bafe6b42d95f3e9a5c17 Mon Sep 17 00:00:00 2001
From: Kyle Edwards <kyedwards@nvidia.com>
Date: Wed, 5 Mar 2025 14:09:13 -0500
Subject: [PATCH 3/3] Remove `fake-publish-wheels` job

---
 .github/workflows/pr.yaml | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index f37581375..8ef0c4ebb 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -77,25 +77,6 @@ jobs:
       build_type: pull-request
       script: "ci/build_wheel.sh"
       matrix_filter: ${{ needs.compute-matrix.outputs.BUILD_MATRIX }}
-  # TODO: Remove this job before merging
-  fake-publish-wheels:
-    needs: build-wheels
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download sdist
-        if: "!cancelled()"
-        uses: actions/download-artifact@v4
-        with:
-          name: sdist
-          path: dist
-      - name: Download wheel
-        if: "!cancelled()"
-        uses: actions/download-artifact@v4
-        with:
-          name: wheel
-          path: dist
-      - name: List wheels
-        run: ls dist/
   test-wheels:
     needs:
       - build-wheels