Skip to content

Commit 6ebd30e

Browse files
committed
rework ci lines
1 parent 7c5dd65 commit 6ebd30e

8 files changed

Lines changed: 9 additions & 16 deletions

File tree

ci/build_cpp.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ source rapids-configure-sccache
88

99
source rapids-date-string
1010

11-
source ./ci/use_conda_packages_from_prs.sh
12-
1311
export CMAKE_GENERATOR=Ninja
1412

1513
rapids-print-env
@@ -25,6 +23,7 @@ export RAPIDS_PACKAGE_VERSION
2523
RAPIDS_ARTIFACTS_DIR=${RAPIDS_ARTIFACTS_DIR:-"${PWD}/artifacts"}
2624
mkdir -p "${RAPIDS_ARTIFACTS_DIR}"
2725
export RAPIDS_ARTIFACTS_DIR
26+
source ./ci/use_conda_packages_from_prs.sh
2827

2928
# populates `RATTLER_CHANNELS` array and `RATTLER_ARGS` array
3029
source rapids-rattler-channel-string

ci/build_docs.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
set -euo pipefail
66

7-
source ./ci/use_conda_packages_from_prs.sh
8-
97
rapids-logger "Downloading artifacts from previous jobs"
108
CPP_CHANNEL=$(rapids-download-conda-from-github cpp)
119
PYTHON_CHANNEL=$(rapids-download-conda-from-github python)
1210

11+
source ./ci/use_conda_packages_from_prs.sh
12+
1313
rapids-logger "Create test conda environment"
1414
. /opt/conda/etc/profile.d/conda.sh
1515

ci/build_go.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44

55
set -euo pipefail
66

7-
source ./ci/use_conda_packages_from_prs.sh
8-
97
rapids-logger "Downloading artifacts from previous jobs"
108
CPP_CHANNEL=$(rapids-download-conda-from-github cpp)
9+
source ./ci/use_conda_packages_from_prs.sh
1110

1211
rapids-logger "Create test conda environment"
1312
. /opt/conda/etc/profile.d/conda.sh

ci/build_java.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
set -euo pipefail
66

7-
source ./ci/use_conda_packages_from_prs.sh
8-
97
# TODO: Remove this argument-handling when build and test workflows are separated,
108
# and test_java.sh no longer calls build_java.sh
119
# ref: https://github.com/rapidsai/cuvs/issues/868
@@ -20,6 +18,7 @@ fi
2018

2119
rapids-logger "Downloading artifacts from previous jobs"
2220
CPP_CHANNEL=$(rapids-download-conda-from-github cpp)
21+
source ./ci/use_conda_packages_from_prs.sh
2322

2423
rapids-logger "Generate Java testing dependencies"
2524

ci/build_python.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@ source rapids-configure-sccache
88

99
source rapids-date-string
1010

11-
source ./ci/use_conda_packages_from_prs.sh
12-
1311
export CMAKE_GENERATOR=Ninja
1412

1513
rapids-print-env
1614

1715
rapids-logger "Begin py build"
1816

1917
CPP_CHANNEL=$(rapids-download-conda-from-github cpp)
18+
source ./ci/use_conda_packages_from_prs.sh
2019

2120
version=$(rapids-generate-version)
2221
export RAPIDS_PACKAGE_VERSION=${version}

ci/build_rust.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44

55
set -euo pipefail
66

7-
source ./ci/use_conda_packages_from_prs.sh
8-
97
rapids-logger "Downloading artifacts from previous jobs"
108
CPP_CHANNEL=$(rapids-download-conda-from-github cpp)
9+
source ./ci/use_conda_packages_from_prs.sh
1110

1211
rapids-logger "Create test conda environment"
1312
. /opt/conda/etc/profile.d/conda.sh

ci/test_cpp.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ set -euo pipefail
66

77
. /opt/conda/etc/profile.d/conda.sh
88

9-
source ./ci/use_conda_packages_from_prs.sh
10-
119
rapids-logger "Configuring conda strict channel priority"
1210
conda config --set channel_priority strict
1311

1412
CPP_CHANNEL=$(rapids-download-conda-from-github cpp)
13+
source ./ci/use_conda_packages_from_prs.sh
1514

1615
rapids-logger "Generate C++ testing dependencies"
1716
rapids-dependency-file-generator \

ci/test_python.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@ set -euo pipefail
66

77
. /opt/conda/etc/profile.d/conda.sh
88

9-
source ./ci/use_conda_packages_from_prs.sh
10-
119
rapids-logger "Configuring conda strict channel priority"
1210
conda config --set channel_priority strict
1311

1412
rapids-logger "Downloading artifacts from previous jobs"
1513
CPP_CHANNEL=$(rapids-download-conda-from-github cpp)
1614
PYTHON_CHANNEL=$(rapids-download-conda-from-github python)
15+
source ./ci/use_conda_packages_from_prs.sh
1716

1817
rapids-logger "Generate Python testing dependencies"
1918
rapids-dependency-file-generator \

0 commit comments

Comments
 (0)