From 5680668829e8c0b22ffe694f292069dd36c4158d Mon Sep 17 00:00:00 2001
From: Allison Piper <alliepiper16@gmail.com>
Date: Wed, 26 Feb 2025 10:12:15 -0500
Subject: [PATCH] Testing RAPIDS w/ 2.8

[skip-matrix][skip-matx][skip-docs][skip-vdc]
---
 .github/workflows/build-rapids.yml            | 15 +++++++++++
 .../workflows/ci-workflow-pull-request.yml    |  3 +++
 ci/rapids/post-create-command.sh              | 26 +++++++++++++++++--
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-rapids.yml b/.github/workflows/build-rapids.yml
index de739c1a161..58513050e4f 100644
--- a/.github/workflows/build-rapids.yml
+++ b/.github/workflows/build-rapids.yml
@@ -1,8 +1,19 @@
 name: Build all RAPIDS repositories
 
 on:
+  workflow_dispatch:
   workflow_call:
     inputs:
+      override_cccl_tag:
+        description: "If set, override the tag used for the CCCL repository."
+        required: false
+        default: ""
+        type: string
+      override_cccl_version:
+        description: "If set, override the version used by rapids-cmake to patch CCCL."
+        required: false
+        default: ""
+        type: string
       enable_slack_alerts:
         description: "If true, a message will be posted to the CCCL GHA CI Alert channel if the workflow fails."
         required: false
@@ -57,6 +68,8 @@ jobs:
           role-duration-seconds: 43200 # 12h
       - name: Run command # Do not change this step's name, it is checked in parse-job-times.py
         env:
+          CCCL_TAG: ${{ inputs.override_cccl_tag }}
+          CCCL_VERSION: ${{ inputs.override_cccl_version }}
           CI: true
           RAPIDS_LIBS: ${{ matrix.libs }}
           # Uncomment any of these to customize the git repo and branch for a RAPIDS lib:
@@ -146,6 +159,8 @@ jobs:
             --docker \
             --cuda ${{matrix.cuda}} \
             --host rapids-conda \
+            --env "CCCL_TAG=${CCCL_TAG}" \
+            --env "CCCL_VERSION=${CCCL_VERSION}" \
             --env "AWS_ROLE_ARN=" \
             --env "AWS_REGION=$AWS_REGION" \
             --env "SCCACHE_REGION=$AWS_REGION" \
diff --git a/.github/workflows/ci-workflow-pull-request.yml b/.github/workflows/ci-workflow-pull-request.yml
index 3c4a4e09700..18db6da7c2e 100644
--- a/.github/workflows/ci-workflow-pull-request.yml
+++ b/.github/workflows/ci-workflow-pull-request.yml
@@ -201,6 +201,9 @@ jobs:
       contents: read
       pull-requests: read
     uses: ./.github/workflows/build-rapids.yml
+    with:
+      override_cccl_tag: "branch/2.8.x"
+      override_cccl_version: "2.8.0"
 
   build-matx:
     name: Build MatX
diff --git a/ci/rapids/post-create-command.sh b/ci/rapids/post-create-command.sh
index dea94465948..a00448c8549 100755
--- a/ci/rapids/post-create-command.sh
+++ b/ci/rapids/post-create-command.sh
@@ -64,9 +64,31 @@ _create_rapids_cmake_override_json() {
         rapids_cmake_upstream="$(yq '.x-git-defaults.upstream' /opt/rapids-build-utils/manifest.yaml)";
     fi
 
+    # Define CCCL_TAG to override the default CCCL SHA. Otherwise the current HEAD of the local checkout is used.
+    if test -n "${CCCL_TAG-}"; then
+        # If CCCL_TAG is defined, fetch it to the local checkout
+        git fetch origin "${CCCL_TAG}";
+        cccl_sha="$(git -C "${HOME}/cccl" rev-parse FETCH_HEAD)";
+    else
+        cccl_sha="$(git -C "${HOME}/cccl" rev-parse HEAD)";
+    fi
+    echo "CCCL_VERSION: ${CCCL_VERSION-}";
+    echo "CCCL_TAG: ${CCCL_TAG-}";
+    echo "cccl_sha: ${cccl_sha}";
+
     curl -fsSL -o- "https://raw.githubusercontent.com/${rapids_cmake_upstream}/rapids-cmake/${rapids_cmake_tag}/rapids-cmake/cpm/versions.json" \
-  | jq -r ".packages.CCCL *= {\"git_url\": \"${HOME}/cccl\", \"git_tag\": \"$(git -C "${HOME}/cccl" rev-parse HEAD)\", \"always_download\": true}" \
-  | tee ~/rapids-cmake-override-versions.json;
+  | jq -r ".packages.CCCL *= {\"git_url\": \"${HOME}/cccl\", \"git_tag\": \"${cccl_sha}\", \"always_download\": true}" \
+  > ~/rapids-cmake-override-versions-cccl-repo.json;
+
+    # Patch the override verision if CCCL_VERSION is defined:
+    if test -n "${CCCL_VERSION-}"; then
+        jq -r ".packages.CCCL.version = \"${CCCL_VERSION}\"" ~/rapids-cmake-override-versions-cccl-repo.json
+      > ~/rapids-cmake-override-versions.json;
+    else
+        mv ~/rapids-cmake-override-versions-cccl-repo.json ~/rapids-cmake-override-versions.json;
+    fi
+
+    cat ~/rapids-cmake-override-versions.json;
 
     # Define default CMake args for each repo
     local -a cmake_args=(BUILD_TESTS BUILD_BENCHMARKS BUILD_PRIMS_BENCH BUILD_CUGRAPH_MG_TESTS);