From 007a6cef9f58b7054d539de90b2a6cfffdc968ec Mon Sep 17 00:00:00 2001 From: Jake Awe Date: Mon, 25 Mar 2024 14:35:20 -0500 Subject: [PATCH 1/2] prevent path conflicts --- ci/build_cpp.sh | 1 + ci/build_python.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index a4ae2b872..d5c62a018 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -16,6 +16,7 @@ rapids-print-env version=$(rapids-generate-version) rapids-logger "Begin cpp build" +conda config --set path_conflict prevent RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild \ conda/recipes/libcuspatial diff --git a/ci/build_python.sh b/ci/build_python.sh index a0ac89948..8aba65431 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -27,6 +27,7 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) rapids-logger "Begin py build cuSpatial" +conda config --set path_conflict prevent # TODO: Remove `--no-test` flag once importing on a CPU # node works correctly RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild \ From 5f80639daee2b66b218e0f0bba203eda3ad94c9e Mon Sep 17 00:00:00 2001 From: Jake Awe Date: Tue, 26 Mar 2024 08:20:57 -0500 Subject: [PATCH 2/2] fix copyright check --- ci/build_cpp.sh | 2 +- ci/build_python.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index d5c62a018..9bc999b45 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. set -euo pipefail diff --git a/ci/build_python.sh b/ci/build_python.sh index 8aba65431..1f010696b 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. set -euo pipefail