From 0a43c7c225cc5d78f949de8a464f786683dcc206 Mon Sep 17 00:00:00 2001 From: James Lamb <jlamb@nvidia.com> Date: Tue, 10 Dec 2024 09:15:26 -0600 Subject: [PATCH] allow path conflicts in conda builds (#801) Nightly conda builds for 24.12 and 25.02 are currently failing because of file-clobbering issues with `xorg-*` packages. It looks like this is because those packages on conda-forge are in the middle of a migration. That clobbering should generally be safe, and anyway is out of our control, so this PR proposes temporarily allowing it in CI. See #800 for details. ## Notes for Reviewers This is intentionally targeting `branch-24.12`, to get nightly builds working there. A few more are still needed to complete the 24.12 release. --- ci/build_cpp.sh | 4 +++- ci/build_python.sh | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 2a347b7e..7ecb5930 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -15,7 +15,9 @@ rapids-print-env rapids-logger "Begin cpp build" -conda config --set path_conflict prevent +# this can be set back to 'prevent' once the xorg-* migrations are completed +# ref: https://github.com/rapidsai/cucim/issues/800#issuecomment-2529593457 +conda config --set path_conflict warn sccache --zero-stats diff --git a/ci/build_python.sh b/ci/build_python.sh index 4c942e09..13f9d8ed 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -16,7 +16,10 @@ rapids-print-env rapids-generate-version > ./VERSION rapids-logger "Begin py build" -conda config --set path_conflict prevent + +# this can be set back to 'prevent' once the xorg-* migrations are completed +# ref: https://github.com/rapidsai/cucim/issues/800#issuecomment-2529593457 +conda config --set path_conflict warn CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)