Skip to content

Commit e06598e

Browse files
committed
Revert "rework ci lines"
This reverts commit 5d14da4.
1 parent f6df0a0 commit e06598e

File tree

5 files changed

+8
-5
lines changed

5 files changed

+8
-5
lines changed

ci/build_cpp.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ set -euo pipefail
77
source rapids-configure-sccache
88
source rapids-date-string
99

10+
source ./ci/use_conda_packages_from_prs.sh
1011
export CMAKE_GENERATOR=Ninja
1112

1213
rapids-print-env
@@ -18,7 +19,6 @@ sccache --stop-server 2>/dev/null || true
1819
RAPIDS_PACKAGE_VERSION=$(rapids-generate-version)
1920
export RAPIDS_PACKAGE_VERSION
2021

21-
source ./ci/use_conda_packages_from_prs.sh
2222
# populates `RATTLER_CHANNELS` array and `RATTLER_ARGS` array
2323
source rapids-rattler-channel-string
2424

ci/build_docs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
set -euo pipefail
55

66
rapids-logger "Downloading artifacts from previous jobs"
7+
source ./ci/use_conda_packages_from_prs.sh
78
CPP_CHANNEL=$(rapids-download-conda-from-github cpp)
89
PYTHON_CHANNEL=$(rapids-download-conda-from-github python)
9-
source ./ci/use_conda_packages_from_prs.sh
1010

1111
rapids-logger "Create test conda environment"
1212
. /opt/conda/etc/profile.d/conda.sh

ci/build_python.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ set -euo pipefail
77
source rapids-configure-sccache
88
source rapids-date-string
99

10+
source ./ci/use_conda_packages_from_prs.sh
11+
1012
export CMAKE_GENERATOR=Ninja
1113

1214
rapids-print-env
@@ -16,7 +18,6 @@ rapids-generate-version > ./VERSION
1618
rapids-logger "Begin py build"
1719

1820
CPP_CHANNEL=$(rapids-download-conda-from-github cpp)
19-
source ./ci/use_conda_packages_from_prs.sh
2021

2122
RAPIDS_PACKAGE_VERSION=$(head -1 ./VERSION)
2223
export RAPIDS_PACKAGE_VERSION

ci/test_cpp.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../
99

1010
. /opt/conda/etc/profile.d/conda.sh
1111

12+
source ./ci/use_conda_packages_from_prs.sh
13+
1214
rapids-logger "Configuring conda strict channel priority"
1315
conda config --set channel_priority strict
1416

1517
rapids-logger "Downloading artifacts from previous jobs"
1618
CPP_CHANNEL=$(rapids-download-conda-from-github cpp)
17-
source ./ci/use_conda_packages_from_prs.sh
1819

1920
rapids-logger "Generate C++ testing dependencies"
2021
rapids-dependency-file-generator \

ci/test_python_common.sh

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

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

9+
source ./ci/use_conda_packages_from_prs.sh
10+
911
rapids-logger "Configuring conda strict channel priority"
1012
conda config --set channel_priority strict
1113

1214
rapids-logger "Downloading artifacts from previous jobs"
1315
CPP_CHANNEL=$(rapids-download-conda-from-github cpp)
1416
PYTHON_CHANNEL=$(rapids-download-conda-from-github python)
15-
source ./ci/use_conda_packages_from_prs.sh
1617

1718
rapids-logger "Generate Python testing dependencies"
1819
rapids-dependency-file-generator \

0 commit comments

Comments
 (0)