Skip to content

Commit 3dff49b

Browse files
authored
Merge pull request #882 from rapidsai/branch-25.06
Forward-merge branch-25.06 into branch-25.08
2 parents 66bbd8a + 166f609 commit 3dff49b

5 files changed

Lines changed: 11 additions & 2 deletions

File tree

.github/workflows/build.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
build_type: ${{ inputs.build_type || 'branch' }}
3434
branch: ${{ inputs.branch }}
3535
date: ${{ inputs.date }}
36+
script: ci/build_cpp.sh
3637
sha: ${{ inputs.sha }}
3738
docs-build:
3839
if: github.ref_type == 'branch'
@@ -46,7 +47,7 @@ jobs:
4647
container_image: "rapidsai/ci-conda:latest"
4748
date: ${{ inputs.date }}
4849
node_type: "gpu-l4-latest-1"
49-
run_script: "ci/build_docs.sh"
50+
script: "ci/build_docs.sh"
5051
sha: ${{ inputs.sha }}
5152
python-build:
5253
needs: [cpp-build]
@@ -56,6 +57,7 @@ jobs:
5657
build_type: ${{ inputs.build_type || 'branch' }}
5758
branch: ${{ inputs.branch }}
5859
date: ${{ inputs.date }}
60+
script: ci/build_python.sh
5961
sha: ${{ inputs.sha }}
6062
upload-conda:
6163
needs: [cpp-build, python-build]

.github/workflows/pr.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,21 @@ jobs:
4545
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.08
4646
with:
4747
build_type: pull-request
48+
script: ci/build_cpp.sh
4849
conda-python-build:
4950
needs: conda-cpp-build
5051
secrets: inherit
5152
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.08
5253
with:
5354
build_type: pull-request
55+
script: ci/build_python.sh
5456
conda-python-tests:
5557
needs: conda-python-build
5658
secrets: inherit
5759
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.08
5860
with:
5961
build_type: pull-request
62+
script: ci/test_python.sh
6063
docs-build:
6164
needs: conda-python-build
6265
secrets: inherit
@@ -66,7 +69,7 @@ jobs:
6669
node_type: "gpu-l4-latest-1"
6770
arch: "amd64"
6871
container_image: "rapidsai/ci-conda:latest"
69-
run_script: "ci/build_docs.sh"
72+
script: "ci/build_docs.sh"
7073
wheel-build:
7174
needs: checks
7275
secrets: inherit

.github/workflows/test.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
build_type: ${{ inputs.build_type }}
2525
branch: ${{ inputs.branch }}
2626
date: ${{ inputs.date }}
27+
script: ci/test_python.sh
2728
sha: ${{ inputs.sha }}
2829
wheel-tests:
2930
secrets: inherit

ci/build_wheel.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ CMAKE_BUILD_TYPE="release"
1010

1111
source rapids-configure-sccache
1212
source rapids-date-string
13+
source rapids-init-pip
1314

1415
rapids-generate-version > ./VERSION
1516

ci/test_wheel.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
set -eou pipefail
55

6+
source rapids-init-pip
7+
68
RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")"
79
PYTHON_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="cucim_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-github python)
810

0 commit comments

Comments
 (0)