From 22342aad0ecd327e3140471c479d01d83b932c23 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 10 Oct 2024 10:32:08 -0500 Subject: [PATCH] make conda installs in CI stricter (#6103) Contributes to https://github.com/rapidsai/build-planning/issues/106 Proposes specifying the RAPIDS version in `conda install` calls that install CI artifacts, to reduce the risk of CI jobs picking up artifacts from other releases. ## Notes for Reviewers This only changes the docs build, because other packages already solve in a single `conda install` with version constraints, thanks to #5781. Authors: - James Lamb (https://github.com/jameslamb) Approvers: - Bradley Dice (https://github.com/bdice) - Dante Gama Dessavre (https://github.com/dantegd) URL: https://github.com/rapidsai/cuml/pull/6103 --- ci/build_docs.sh | 11 +++++------ ci/release/update-version.sh | 1 - 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 9fc1e5c498..44980ae83d 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -5,6 +5,8 @@ set -euo pipefail rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh +RAPIDS_VERSION="$(rapids-version)" + rapids-dependency-file-generator \ --output conda \ --file-key docs \ @@ -23,11 +25,9 @@ PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python) rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ --channel "${PYTHON_CHANNEL}" \ - cuml libcuml + "cuml=${RAPIDS_VERSION}" \ + "libcuml=${RAPIDS_VERSION}" -export RAPIDS_VERSION="$(rapids-version)" -export RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)" -export RAPIDS_VERSION_NUMBER="24.12" export RAPIDS_DOCS_DIR="$(mktemp -d)" rapids-logger "Build CPP docs" @@ -44,5 +44,4 @@ mkdir -p "${RAPIDS_DOCS_DIR}/cuml/html" mv _html/* "${RAPIDS_DOCS_DIR}/cuml/html" popd -rapids-upload-docs - +RAPIDS_VERSION_NUMBER="$(rapids-version-major-minor)" rapids-upload-docs diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index e234e1401f..12fb47b271 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -72,7 +72,6 @@ for FILE in .github/workflows/*.yaml; do # Wheel builds clone cumlprims_mg, update its branch sed_runner "s/extra-repo-sha: branch-.*/extra-repo-sha: branch-${NEXT_SHORT_TAG}/g" "${FILE}" done -sed_runner "s/RAPIDS_VERSION_NUMBER=\".*/RAPIDS_VERSION_NUMBER=\"${NEXT_SHORT_TAG}\"/g" ci/build_docs.sh # .devcontainer files find .devcontainer/ -type f -name devcontainer.json -print0 | while IFS= read -r -d '' filename; do