Skip to content

Commit 1b70ffd

Browse files
authored
make conda installs in CI stricter (part 2) (#1703)
Follow-up to #1696 Changes relative to that PR: * switches to pinning CI conda installs to the output of `rapids-version` (`{major}.{minor}.{patch}`) instead of `rapids-version-major-minor` (`{major}.{minor}`), to get a bit more protection in the presence of hotfix releases * restores some exporting of variables needed for docs builds In #1696, I'd missed that this project's Doxygen setup is expecting to find `RAPIDS_VERSION_MAJOR_MINOR` defined in the environment. https://github.com/rapidsai/rmm/blob/90a5631e1093ce44c4feceb88fcf557c3dfc043b/ci/build_docs.sh#L36 https://github.com/rapidsai/rmm/blob/90a5631e1093ce44c4feceb88fcf557c3dfc043b/doxygen/Doxyfile#L41 Authors: - James Lamb (https://github.com/jameslamb) Approvers: - Mike Sarahan (https://github.com/msarahan) URL: #1703
1 parent 90a5631 commit 1b70ffd

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

ci/build_docs.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ set -euo pipefail
66
rapids-logger "Create test conda environment"
77
. /opt/conda/etc/profile.d/conda.sh
88

9-
RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)"
10-
export RAPIDS_VERSION_NUMBER="$RAPIDS_VERSION_MAJOR_MINOR"
9+
RAPIDS_VERSION="$(rapids-version)"
10+
export RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)"
1111

1212
rapids-dependency-file-generator \
1313
--output conda \
@@ -26,8 +26,8 @@ PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
2626
rapids-mamba-retry install \
2727
--channel "${CPP_CHANNEL}" \
2828
--channel "${PYTHON_CHANNEL}" \
29-
"rmm=${RAPIDS_VERSION_MAJOR_MINOR}" \
30-
"librmm=${RAPIDS_VERSION_MAJOR_MINOR}"
29+
"rmm=${RAPIDS_VERSION}" \
30+
"librmm=${RAPIDS_VERSION}"
3131

3232
export RAPIDS_DOCS_DIR="$(mktemp -d)"
3333

@@ -45,4 +45,4 @@ mkdir -p "${RAPIDS_DOCS_DIR}/rmm/html"
4545
mv _build/dirhtml/* "${RAPIDS_DOCS_DIR}/rmm/html"
4646
popd
4747

48-
rapids-upload-docs
48+
RAPIDS_VERSION_NUMBER="${RAPIDS_VERSION_MAJOR_MINOR}" rapids-upload-docs

ci/test_cpp.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../
88

99
. /opt/conda/etc/profile.d/conda.sh
1010

11-
RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)"
11+
RAPIDS_VERSION="$(rapids-version)"
1212

1313
rapids-logger "Generate C++ testing dependencies"
1414
rapids-dependency-file-generator \
@@ -31,8 +31,8 @@ rapids-print-env
3131

3232
rapids-mamba-retry install \
3333
--channel "${CPP_CHANNEL}" \
34-
"librmm=${RAPIDS_VERSION_MAJOR_MINOR}" \
35-
"librmm-tests=${RAPIDS_VERSION_MAJOR_MINOR}"
34+
"librmm=${RAPIDS_VERSION}" \
35+
"librmm-tests=${RAPIDS_VERSION}"
3636

3737
rapids-logger "Check GPU usage"
3838
nvidia-smi

ci/test_python.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../
99
rapids-logger "Create test conda environment"
1010
. /opt/conda/etc/profile.d/conda.sh
1111

12-
RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)"
12+
RAPIDS_VERSION="$(rapids-version)"
1313

1414
rapids-dependency-file-generator \
1515
--output conda \
@@ -30,8 +30,8 @@ PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
3030
rapids-mamba-retry install \
3131
--channel "${CPP_CHANNEL}" \
3232
--channel "${PYTHON_CHANNEL}" \
33-
"rmm=${RAPIDS_VERSION_MAJOR_MINOR}" \
34-
"librmm=${RAPIDS_VERSION_MAJOR_MINOR}"
33+
"rmm=${RAPIDS_VERSION}" \
34+
"librmm=${RAPIDS_VERSION}"
3535

3636
RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}
3737
RAPIDS_COVERAGE_DIR=${RAPIDS_COVERAGE_DIR:-"${PWD}/coverage-results"}

0 commit comments

Comments
 (0)