From 8fea7de8821a2f0cfe28b8acd95d15fc97b88347 Mon Sep 17 00:00:00 2001
From: Graham Markall <gmarkall@nvidia.com>
Date: Thu, 1 Aug 2024 13:07:38 +0100
Subject: [PATCH] Use whole conda repo as conda artifact

---
 .github/workflows/conda-python-build.yaml | 6 +++---
 .github/workflows/conda-python-tests.yaml | 2 +-
 .github/workflows/docs-build.yaml         | 2 +-
 ci/build_docs.sh                          | 4 +---
 ci/test_conda.sh                          | 4 +---
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/conda-python-build.yaml b/.github/workflows/conda-python-build.yaml
index c861eaa..ebb7930 100644
--- a/.github/workflows/conda-python-build.yaml
+++ b/.github/workflows/conda-python-build.yaml
@@ -112,12 +112,12 @@ jobs:
         run: ${{ inputs.script }}
         env:
           GH_TOKEN: ${{ github.token }}
-      - name: Upload conda package
+      - name: Upload conda repo
         if: "!cancelled()"
         uses: actions/upload-artifact@v4
         with:
-          name: conda-package
-          path: ${{ env.package_path }}
+          name: conda-repo
+          path: "/tmp/conda-bld-output/noarch"
       - name: Publish conda package
         if: inputs.upload_to_anaconda
         run: "ci/upload_conda.sh"
diff --git a/.github/workflows/conda-python-tests.yaml b/.github/workflows/conda-python-tests.yaml
index 45761c0..ba9390e 100644
--- a/.github/workflows/conda-python-tests.yaml
+++ b/.github/workflows/conda-python-tests.yaml
@@ -121,7 +121,7 @@ jobs:
           ref: ${{ inputs.sha }}
           fetch-depth: 0
       - uses: actions/download-artifact@v4
-        name: conda-package
+        name: conda-repo
       - name: Display structure of downloaded files
         run: ls -R
       - name: Standardize repository information
diff --git a/.github/workflows/docs-build.yaml b/.github/workflows/docs-build.yaml
index 3e6f5cc..d4416e4 100644
--- a/.github/workflows/docs-build.yaml
+++ b/.github/workflows/docs-build.yaml
@@ -56,7 +56,7 @@ jobs:
           ref: ${{ inputs.sha }}
           fetch-depth: 0
       - uses: actions/download-artifact@v4
-        name: conda-package
+        name: conda-repo
       - name: Display structure of downloaded files
         run: ls -R
       - name: Standardize repository information
diff --git a/ci/build_docs.sh b/ci/build_docs.sh
index ba06dee..7eb57b4 100755
--- a/ci/build_docs.sh
+++ b/ci/build_docs.sh
@@ -19,9 +19,7 @@ set +u
 conda activate docs
 set -u
 
-package=$(realpath conda-package/numba-cuda-*.tar.bz2)
-echo "Package path: $package"
-rapids-mamba-retry install $package
+rapids-mamba-retry install -c `pwd`/conda-repo numba-cuda
 
 rapids-print-env
 
diff --git a/ci/test_conda.sh b/ci/test_conda.sh
index 1975553..5861128 100755
--- a/ci/test_conda.sh
+++ b/ci/test_conda.sh
@@ -24,9 +24,7 @@ set +u
 conda activate test
 set -u
 
-package=$(realpath conda-package/numba-cuda-*.tar.bz2)
-echo "Package path: $package"
-rapids-mamba-retry install $package
+rapids-mamba-retry install -c `pwd`/conda-repo numba-cuda
 
 RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}/
 mkdir -p "${RAPIDS_TESTS_DIR}"