From d05eab3b831059d59e10a8c0d5955b000bcaf4b9 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Tue, 10 Jun 2025 17:04:45 +0000 Subject: [PATCH 1/3] Remove label --- .github/workflows/build-cuvs-image.yml | 4 ++-- .github/workflows/build-rapids-image.yml | 4 ++-- context/condarc | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-cuvs-image.yml b/.github/workflows/build-cuvs-image.yml index eedb6635..f77cb069 100644 --- a/.github/workflows/build-cuvs-image.yml +++ b/.github/workflows/build-cuvs-image.yml @@ -64,8 +64,8 @@ jobs: GIT_DESCRIBE_TAG="$(git describe --tags --abbrev=0)" GIT_DESCRIBE_TAG="${GIT_DESCRIBE_TAG:1}" # remove leading 'v' if [[ ! $GIT_DESCRIBE_TAG =~ [a-z] ]]; then - rapids-logger "Most recent tag is for release, adding `rapidsai` channel and removing `rapidsai-nightly` and `dask/label/dev` channels." - sed -i 's|rapidsai-nightly|rapidsai|;\|dask/label/dev|d' context/condarc + rapids-logger "Most recent tag is for release, adding the `rapidsai` channel and removing the `rapidsai-nightly` channel." + sed -i 's|rapidsai-nightly|rapidsai|d' context/condarc else rapids-logger "Most recent tag is an alpha. Build will use nightly channels." fi diff --git a/.github/workflows/build-rapids-image.yml b/.github/workflows/build-rapids-image.yml index 0af5d839..b5d52f63 100644 --- a/.github/workflows/build-rapids-image.yml +++ b/.github/workflows/build-rapids-image.yml @@ -58,8 +58,8 @@ jobs: GIT_DESCRIBE_TAG="$(git describe --tags --abbrev=0)" GIT_DESCRIBE_TAG="${GIT_DESCRIBE_TAG:1}" # remove leading 'v' if [[ ! $GIT_DESCRIBE_TAG =~ [a-z] ]]; then - rapids-logger "Most recent tag is for release, adding `rapidsai` channel and removing `rapidsai-nightly` and `dask/label/dev` channels." - sed -i 's|rapidsai-nightly|rapidsai|;\|dask/label/dev|d' context/condarc + rapids-logger "Most recent tag is for release, adding the `rapidsai` channel and removing the `rapidsai-nightly` channel." + sed -i 's|rapidsai-nightly|rapidsai|d' context/condarc else rapids-logger "Most recent tag is an alpha. Build will use nightly channels." fi diff --git a/context/condarc b/context/condarc index 1a9827fa..dfb40fcb 100644 --- a/context/condarc +++ b/context/condarc @@ -1,7 +1,6 @@ auto_update_conda: False channels: - rapidsai-nightly - - dask/label/dev - pytorch - conda-forge - nvidia From cb68a74003077efaf69859a692b5c7b28697d265 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Tue, 10 Jun 2025 10:22:11 -0700 Subject: [PATCH 2/3] Apply suggestions from code review Co-authored-by: James Lamb --- .github/workflows/build-cuvs-image.yml | 2 +- .github/workflows/build-rapids-image.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-cuvs-image.yml b/.github/workflows/build-cuvs-image.yml index f77cb069..05ffe86d 100644 --- a/.github/workflows/build-cuvs-image.yml +++ b/.github/workflows/build-cuvs-image.yml @@ -65,7 +65,7 @@ jobs: GIT_DESCRIBE_TAG="${GIT_DESCRIBE_TAG:1}" # remove leading 'v' if [[ ! $GIT_DESCRIBE_TAG =~ [a-z] ]]; then rapids-logger "Most recent tag is for release, adding the `rapidsai` channel and removing the `rapidsai-nightly` channel." - sed -i 's|rapidsai-nightly|rapidsai|d' context/condarc + sed -i 's|rapidsai-nightly|rapidsai|' context/condarc else rapids-logger "Most recent tag is an alpha. Build will use nightly channels." fi diff --git a/.github/workflows/build-rapids-image.yml b/.github/workflows/build-rapids-image.yml index b5d52f63..628d0193 100644 --- a/.github/workflows/build-rapids-image.yml +++ b/.github/workflows/build-rapids-image.yml @@ -59,7 +59,7 @@ jobs: GIT_DESCRIBE_TAG="${GIT_DESCRIBE_TAG:1}" # remove leading 'v' if [[ ! $GIT_DESCRIBE_TAG =~ [a-z] ]]; then rapids-logger "Most recent tag is for release, adding the `rapidsai` channel and removing the `rapidsai-nightly` channel." - sed -i 's|rapidsai-nightly|rapidsai|d' context/condarc + sed -i 's|rapidsai-nightly|rapidsai|' context/condarc else rapids-logger "Most recent tag is an alpha. Build will use nightly channels." fi From 8d63abf6cd67ce1f8ccaa70d97f84e2b0e90fee8 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Wed, 11 Jun 2025 22:56:37 +0000 Subject: [PATCH 3/3] Remove more channels --- context/condarc | 2 -- 1 file changed, 2 deletions(-) diff --git a/context/condarc b/context/condarc index dfb40fcb..e9ae6667 100644 --- a/context/condarc +++ b/context/condarc @@ -1,6 +1,4 @@ auto_update_conda: False channels: - rapidsai-nightly - - pytorch - conda-forge - - nvidia