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)