Skip to content

Commit c60bcb1

Browse files
authored
Merge pull request #1511 from rapidsai/branch-24.04
Forward-merge branch-24.04 into branch-24.06 [skip ci]
2 parents fb23a13 + 0651edf commit c60bcb1

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

ci/build_docs.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ rapids-dependency-file-generator \
1111
--file_key docs \
1212
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml
1313

14-
rapids-mamba-retry env create --force -f env.yaml -n docs
14+
rapids-mamba-retry env create --yes -f env.yaml -n docs
1515
conda activate docs
1616

1717
rapids-print-env

ci/check_style.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ rapids-dependency-file-generator \
1111
--file_key checks \
1212
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml
1313

14-
rapids-mamba-retry env create --force -f env.yaml -n checks
14+
rapids-mamba-retry env create --yes -f env.yaml -n checks
1515
conda activate checks
1616

1717
RAPIDS_VERSION_NUMBER="$(rapids-version-major-minor)"

ci/test_cpp.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ rapids-dependency-file-generator \
1414
--file_key test_cpp \
1515
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" | tee env.yaml
1616

17-
rapids-mamba-retry env create --force -f env.yaml -n test
17+
rapids-mamba-retry env create --yes -f env.yaml -n test
1818

1919
# Temporarily allow unbound variables for conda activation.
2020
set +u

ci/test_python.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ rapids-dependency-file-generator \
1414
--file_key test_python \
1515
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml
1616

17-
rapids-mamba-retry env create --force -f env.yaml -n test
17+
rapids-mamba-retry env create --yes -f env.yaml -n test
1818
set +u
1919
conda activate test
2020
set -u

0 commit comments

Comments
 (0)