Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make conda installs in CI stricter #298

Merged
merged 4 commits into from
Oct 11, 2024
Merged

make conda installs in CI stricter #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c69ea8f
make conda installs in CI stricter
jameslamb Oct 10, 2024
6b5dca0
rapids-version does not work in this repo
jameslamb Oct 10, 2024
9936410
empty commit to get past github disruption
jameslamb Oct 10, 2024
5b5dddd
use head for consistency with ucx-py
jameslamb Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ci/build_docs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ set -euo pipefail
rapids-logger "Create test conda environment"
. /opt/conda/etc/profile.d/conda.sh

export UCXX_VERSION="$(head -1 ./VERSION)"
UCXX_VERSION_MAJOR_MINOR="$(sed -E -e 's/^([0-9]+)\.([0-9]+)\.([0-9]+).*$/\1.\2/' VERSION)"

ENV_YAML_DIR="$(mktemp -d)"

rapids-dependency-file-generator \
Expand All @@ -23,11 +26,8 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)

rapids-mamba-retry install \
--channel "${CPP_CHANNEL}" \
libucxx
"libucxx=${UCXX_VERSION}"

export UCXX_VERSION="$(sed -E -e 's/^([0-9]+)\.([0-9]+)\.([0-9]+).*$/\1.\2.\3/' VERSION)"
export UCXX_VERSION_MAJOR_MINOR="$(sed -E -e 's/^([0-9]+)\.([0-9]+)\.([0-9]+).*$/\1.\2/' VERSION)"
export RAPIDS_VERSION_NUMBER="$UCXX_VERSION_MAJOR_MINOR"
export RAPIDS_DOCS_DIR="$(mktemp -d)"

rapids-logger "Build CPP docs"
Expand All @@ -37,4 +37,4 @@ mkdir -p "${RAPIDS_DOCS_DIR}/libucxx/html"
mv html/* "${RAPIDS_DOCS_DIR}/libucxx/html"
popd

rapids-upload-docs
RAPIDS_VERSION_NUMBER="${UCXX_VERSION_MAJOR_MINOR}" rapids-upload-docs
6 changes: 5 additions & 1 deletion ci/test_cpp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ source "$(dirname "$0")/test_common.sh"
rapids-logger "Create test conda environment"
. /opt/conda/etc/profile.d/conda.sh

UCXX_VERSION="$(head -1 ./VERSION)"

rapids-dependency-file-generator \
--output conda \
--file-key test_cpp \
Expand All @@ -29,7 +31,9 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)

rapids-mamba-retry install \
--channel "${CPP_CHANNEL}" \
libucxx libucxx-examples libucxx-tests
"libucxx=${UCXX_VERSION}" \
"libucxx-examples=${UCXX_VERSION}" \
"libucxx-tests=${UCXX_VERSION}"

print_ucx_config

Expand Down
5 changes: 4 additions & 1 deletion ci/test_python.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ source "$(dirname "$0")/test_common.sh"
rapids-logger "Create test conda environment"
. /opt/conda/etc/profile.d/conda.sh

UCXX_VERSION="$(head -1 ./VERSION)"

rapids-dependency-file-generator \
--output conda \
--file-key test_python \
Expand All @@ -27,7 +29,8 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)

rapids-mamba-retry install \
--channel "${CPP_CHANNEL}" \
libucxx ucxx
"libucxx=${UCXX_VERSION}" \
"ucxx=${UCXX_VERSION}"

print_ucx_config

Expand Down
6 changes: 5 additions & 1 deletion ci/test_python_distributed.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ source "$(dirname "$0")/test_common.sh"
rapids-logger "Create test conda environment"
. /opt/conda/etc/profile.d/conda.sh

UCXX_VERSION="$(head -1 ./VERSION)"

rapids-dependency-file-generator \
--output conda \
--file-key test_python_distributed \
Expand All @@ -27,7 +29,9 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)

rapids-mamba-retry install \
--channel "${CPP_CHANNEL}" \
libucxx ucxx distributed-ucxx
"libucxx=${UCXX_VERSION}" \
"ucxx=${UCXX_VERSION}" \
"distributed-ucxx=${UCXX_VERSION}"

print_ucx_config

Expand Down