Skip to content

Commit 1327a21

Browse files
KyleFromNVIDIAVenkateshJaya
authored andcommitted
Consolidate more Conda solves in CI (rapidsai#1828)
Issue: rapidsai/build-planning#22 Authors: - Kyle Edwards (https://github.com/KyleFromNVIDIA) Approvers: - Bradley Dice (https://github.com/bdice) URL: rapidsai#1828
1 parent 904c610 commit 1327a21

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

ci/build_docs.sh

+8-12
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,30 @@
33

44
set -euo pipefail
55

6+
rapids-logger "Downloading artifacts from previous jobs"
7+
CPP_CHANNEL=$(rapids-download-conda-from-github cpp)
8+
PYTHON_CHANNEL=$(rapids-download-conda-from-github python)
9+
610
rapids-logger "Create test conda environment"
711

812
. /opt/conda/etc/profile.d/conda.sh
913

10-
RAPIDS_VERSION="$(rapids-version)"
1114
RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)"
1215
export RAPIDS_VERSION_MAJOR_MINOR
1316

1417
rapids-dependency-file-generator \
1518
--output conda \
1619
--file-key docs \
17-
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml
20+
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" \
21+
--prepend-channel "${CPP_CHANNEL}" \
22+
--prepend-channel "${PYTHON_CHANNEL}" \
23+
| tee env.yaml
1824

1925
rapids-mamba-retry env create --yes -f env.yaml -n docs
2026
conda activate docs
2127

2228
rapids-print-env
2329

24-
rapids-logger "Downloading artifacts from previous jobs"
25-
CPP_CHANNEL=$(rapids-download-conda-from-github cpp)
26-
PYTHON_CHANNEL=$(rapids-download-conda-from-github python)
27-
28-
rapids-mamba-retry install \
29-
--channel "${CPP_CHANNEL}" \
30-
--channel "${PYTHON_CHANNEL}" \
31-
"rmm=${RAPIDS_VERSION}" \
32-
"librmm=${RAPIDS_VERSION}"
33-
3430
RAPIDS_DOCS_DIR="$(mktemp -d)"
3531
export RAPIDS_DOCS_DIR
3632

dependencies.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ files:
4444
- cuda_version
4545
- docs
4646
- py_version
47+
- depends_on_rmm
48+
- depends_on_librmm
4749
py_cpp_build:
4850
output: pyproject
4951
pyproject_dir: python/librmm

0 commit comments

Comments
 (0)