Merge pull request #802 from rapidsai/branch-24.12

Forward-merge branch-24.12 into branch-25.02
rapidsai · Dec 10, 2024 · a1c4ba1 · a1c4ba1
2 parents 1f708ef + 0a43c7c
commit a1c4ba1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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)