Skip to content

Commit 3bf5104

Browse files
committed
Testing RAPIDS w/ 2.8
[skip-matrix][skip-matx][skip-docs][skip-vdc]
1 parent cd6a090 commit 3bf5104

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

.github/workflows/build-rapids.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ name: Build all RAPIDS repositories
33
on:
44
workflow_call:
55
inputs:
6+
override_cccl_tag:
7+
description: "If set, override the tag used for the CCCL repository."
8+
required: false
9+
default: ""
10+
type: string
611
enable_slack_alerts:
712
description: "If true, a message will be posted to the CCCL GHA CI Alert channel if the workflow fails."
813
required: false
@@ -57,6 +62,7 @@ jobs:
5762
role-duration-seconds: 43200 # 12h
5863
- name: Run command # Do not change this step's name, it is checked in parse-job-times.py
5964
env:
65+
CCCL_TAG: ${{ inputs.override_cccl_tag }}
6066
CI: true
6167
RAPIDS_LIBS: ${{ matrix.libs }}
6268
# Uncomment any of these to customize the git repo and branch for a RAPIDS lib:
@@ -146,6 +152,7 @@ jobs:
146152
--docker \
147153
--cuda ${{matrix.cuda}} \
148154
--host rapids-conda \
155+
--env "CCCL_TAG=${CCCL_TAG}" \
149156
--env "AWS_ROLE_ARN=" \
150157
--env "AWS_REGION=$AWS_REGION" \
151158
--env "SCCACHE_REGION=$AWS_REGION" \

.github/workflows/ci-workflow-pull-request.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,8 @@ jobs:
201201
contents: read
202202
pull-requests: read
203203
uses: ./.github/workflows/build-rapids.yml
204+
with:
205+
override_cccl_tag: "branch/2.8.x"
204206

205207
build-matx:
206208
name: Build MatX

ci/rapids/post-create-command.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,13 @@ _create_rapids_cmake_override_json() {
6464
rapids_cmake_upstream="$(yq '.x-git-defaults.upstream' /opt/rapids-build-utils/manifest.yaml)";
6565
fi
6666

67+
# Define CCCL_TAG to override the default CCCL SHA. Otherwise the current HEAD of the local checkout is used.
68+
cccl_sha="$(git -C "${HOME}/cccl" rev-parse "${CCCL_TAG-HEAD}")";
69+
echo "CCCL_TAG: ${CCCL_TAG-HEAD}";
70+
echo "cccl_sha: ${cccl_sha}";
71+
6772
curl -fsSL -o- "https://raw.githubusercontent.com/${rapids_cmake_upstream}/rapids-cmake/${rapids_cmake_tag}/rapids-cmake/cpm/versions.json" \
68-
| jq -r ".packages.CCCL *= {\"git_url\": \"${HOME}/cccl\", \"git_tag\": \"$(git -C "${HOME}/cccl" rev-parse HEAD)\", \"always_download\": true}" \
73+
| jq -r ".packages.CCCL *= {\"git_url\": \"${HOME}/cccl\", \"git_tag\": \"${cccl_sha}\", \"always_download\": true}" \
6974
| tee ~/rapids-cmake-override-versions.json;
7075

7176
# Define default CMake args for each repo

0 commit comments

Comments
 (0)