Skip to content

Commit ba41c59

Browse files
hcho3hcho3
committed
Fix bad git merge
1 parent 98ac84c commit ba41c59

16 files changed

+84
-84
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ concurrency:
3535
jobs:
3636
cpp-build:
3737
secrets: inherit
38-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@main
38+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@release/26.04
3939
with:
4040
build_type: ${{ inputs.build_type || 'branch' }}
4141
node_type: cpu16
@@ -46,7 +46,7 @@ jobs:
4646
python-build:
4747
needs: [cpp-build]
4848
secrets: inherit
49-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@main
49+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@release/26.04
5050
with:
5151
build_type: ${{ inputs.build_type || 'branch' }}
5252
branch: ${{ inputs.branch }}
@@ -59,28 +59,28 @@ jobs:
5959
if: github.ref_type == 'branch'
6060
needs: [python-build]
6161
secrets: inherit
62-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
62+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/26.04
6363
with:
6464
arch: "amd64"
6565
branch: ${{ inputs.branch }}
6666
build_type: ${{ inputs.build_type || 'branch' }}
67-
container_image: "rapidsai/ci-conda:26.06-latest"
67+
container_image: "rapidsai/ci-conda:26.04-latest"
6868
date: ${{ inputs.date }}
6969
node_type: gpu-l4-latest-1
7070
script: "ci/build_docs.sh"
7171
sha: ${{ inputs.sha }}
7272
upload-conda:
7373
needs: [cpp-build, python-build]
7474
secrets: inherit
75-
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@main
75+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@release/26.04
7676
with:
7777
build_type: ${{ inputs.build_type || 'branch' }}
7878
branch: ${{ inputs.branch }}
7979
date: ${{ inputs.date }}
8080
sha: ${{ inputs.sha }}
8181
wheel-build-libnvforest:
8282
secrets: inherit
83-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
83+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/26.04
8484
with:
8585
build_type: ${{ inputs.build_type || 'branch' }}
8686
branch: ${{ inputs.branch }}
@@ -95,7 +95,7 @@ jobs:
9595
wheel-publish-libnvforest:
9696
needs: wheel-build-libnvforest
9797
secrets: inherit
98-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@main
98+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@release/26.04
9999
with:
100100
build_type: ${{ inputs.build_type || 'branch' }}
101101
branch: ${{ inputs.branch }}
@@ -106,7 +106,7 @@ jobs:
106106
wheel-build-nvforest:
107107
needs: wheel-build-libnvforest
108108
secrets: inherit
109-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
109+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/26.04
110110
with:
111111
build_type: ${{ inputs.build_type || 'branch' }}
112112
branch: ${{ inputs.branch }}
@@ -121,7 +121,7 @@ jobs:
121121
wheel-publish-nvforest:
122122
needs: wheel-build-nvforest
123123
secrets: inherit
124-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@main
124+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@release/26.04
125125
with:
126126
build_type: ${{ inputs.build_type || 'branch' }}
127127
branch: ${{ inputs.branch }}

‎.github/workflows/pr.yaml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- wheel-tests-nvforest
2727
- devcontainer
2828
secrets: inherit
29-
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@main
29+
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@release/26.04
3030
if: always()
3131
with:
3232
needs: ${{ toJSON(needs) }}
@@ -38,7 +38,7 @@ jobs:
3838
steps:
3939
- name: Telemetry setup
4040
if: ${{ vars.TELEMETRY_ENABLED == 'true' }}
41-
uses: rapidsai/shared-actions/telemetry-dispatch-stash-base-env-vars@main
41+
uses: rapidsai/shared-actions/telemetry-dispatch-stash-base-env-vars@release/26.04
4242
check-nightly-ci:
4343
runs-on: ubuntu-latest
4444
permissions:
@@ -49,17 +49,17 @@ jobs:
4949
steps:
5050
- name: Get PR Info
5151
id: get-pr-info
52-
uses: nv-gha-runners/get-pr-info@main
52+
uses: nv-gha-runners/get-pr-info@release/26.04
5353
- name: Check if nightly CI is passing
54-
uses: rapidsai/shared-actions/check_nightly_success/dispatch@main
54+
uses: rapidsai/shared-actions/check_nightly_success/dispatch@release/26.04
5555
with:
5656
repo: ${{ github.repository }}
5757
target-branch: ${{ fromJSON(steps.get-pr-info.outputs.pr-info).base.ref }}
5858
max-days-without-success: 7
5959
changed-files:
6060
secrets: inherit
6161
needs: telemetry-setup
62-
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@main
62+
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@release/26.04
6363
with:
6464
files_yaml: |
6565
build_docs:
@@ -136,7 +136,7 @@ jobs:
136136
checks:
137137
secrets: inherit
138138
needs: telemetry-setup
139-
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@main
139+
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@release/26.04
140140
with:
141141
enable_check_generated_files: false
142142
enable_check_version_against_tag: false # TODO: Take this out after first release
@@ -145,39 +145,39 @@ jobs:
145145
clang-tidy:
146146
needs: checks
147147
secrets: inherit
148-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
148+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/26.04
149149
with:
150150
build_type: pull-request
151151
node_type: "cpu8"
152152
arch: "amd64"
153-
container_image: "rapidsai/ci-conda:26.06-latest"
153+
container_image: "rapidsai/ci-conda:26.04-latest"
154154
script: "ci/run_clang_tidy.sh"
155155
conda-cpp-build:
156156
needs: checks
157157
secrets: inherit
158-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@main
158+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@release/26.04
159159
with:
160160
build_type: pull-request
161161
node_type: cpu16
162162
script: ci/build_cpp.sh
163163
conda-cpp-tests:
164164
needs: [conda-cpp-build, changed-files]
165165
secrets: inherit
166-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@main
166+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@release/26.04
167167
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp
168168
with:
169169
build_type: pull-request
170170
script: ci/test_cpp.sh
171171
conda-cpp-checks:
172172
needs: conda-cpp-build
173173
secrets: inherit
174-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@main
174+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@release/26.04
175175
with:
176176
build_type: pull-request
177177
conda-python-build:
178178
needs: conda-cpp-build
179179
secrets: inherit
180-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@main
180+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@release/26.04
181181
with:
182182
build_type: pull-request
183183
script: ci/build_python.sh
@@ -186,7 +186,7 @@ jobs:
186186
conda-python-tests:
187187
needs: [conda-python-build, changed-files]
188188
secrets: inherit
189-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@main
189+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@release/26.04
190190
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python_conda
191191
with:
192192
build_type: pull-request
@@ -195,18 +195,18 @@ jobs:
195195
docs-build:
196196
needs: [conda-python-build, changed-files]
197197
secrets: inherit
198-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
198+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/26.04
199199
if: fromJSON(needs.changed-files.outputs.changed_file_groups).build_docs
200200
with:
201201
build_type: pull-request
202202
node_type: gpu-l4-latest-1
203203
arch: "amd64"
204-
container_image: "rapidsai/ci-conda:26.06-latest"
204+
container_image: "rapidsai/ci-conda:26.04-latest"
205205
script: "ci/build_docs.sh"
206206
wheel-build-libnvforest:
207207
needs: checks
208208
secrets: inherit
209-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
209+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/26.04
210210
with:
211211
build_type: pull-request
212212
branch: ${{ inputs.branch }}
@@ -221,7 +221,7 @@ jobs:
221221
wheel-build-nvforest:
222222
needs: [checks, wheel-build-libnvforest]
223223
secrets: inherit
224-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
224+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/26.04
225225
with:
226226
build_type: pull-request
227227
node_type: cpu8
@@ -233,7 +233,7 @@ jobs:
233233
wheel-tests-nvforest:
234234
needs: [wheel-build-nvforest, changed-files]
235235
secrets: inherit
236-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@main
236+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/26.04
237237
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python_wheels
238238
with:
239239
build_type: pull-request
@@ -262,6 +262,6 @@ jobs:
262262
continue-on-error: true
263263
steps:
264264
- name: Telemetry summarize
265-
uses: rapidsai/shared-actions/telemetry-dispatch-summarize@main
265+
uses: rapidsai/shared-actions/telemetry-dispatch-summarize@release/26.04
266266
env:
267267
GH_TOKEN: ${{ github.token }}

‎.github/workflows/test.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ on:
2525
jobs:
2626
conda-cpp-checks:
2727
secrets: inherit
28-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@main
28+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@release/26.04
2929
with:
3030
build_type: ${{ inputs.build_type }}
3131
branch: ${{ inputs.branch }}
3232
date: ${{ inputs.date }}
3333
sha: ${{ inputs.sha }}
3434
conda-cpp-tests:
3535
secrets: inherit
36-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@main
36+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@release/26.04
3737
with:
3838
build_type: ${{ inputs.build_type }}
3939
branch: ${{ inputs.branch }}
@@ -42,7 +42,7 @@ jobs:
4242
sha: ${{ inputs.sha }}
4343
conda-python-tests:
4444
secrets: inherit
45-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@main
45+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@release/26.04
4646
with:
4747
build_type: ${{ inputs.build_type }}
4848
branch: ${{ inputs.branch }}
@@ -52,7 +52,7 @@ jobs:
5252
run_codecov: false
5353
wheel-tests-nvforest:
5454
secrets: inherit
55-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@main
55+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/26.04
5656
with:
5757
build_type: ${{ inputs.build_type }}
5858
branch: ${{ inputs.branch }}

‎RAPIDS_BRANCH‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
main
1+
release/26.04

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
26.06.00
1+
26.04.00

‎conda/environments/all_cuda-129_arch-aarch64.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,23 @@ dependencies:
2525
- libcurand-dev
2626
- libcusolver-dev
2727
- libcusparse-dev
28-
- libraft==26.6.*,>=0.0.0a0
29-
- librmm==26.6.*,>=0.0.0a0
28+
- libraft==26.4.*,>=0.0.0a0
29+
- librmm==26.4.*,>=0.0.0a0
3030
- ninja
3131
- numpy>=1.23,<3.0a0
3232
- numpydoc
3333
- packaging
3434
- pandas
3535
- pre-commit
3636
- pydata-sphinx-theme
37-
- pylibraft==26.6.*,>=0.0.0a0
37+
- pylibraft==26.4.*,>=0.0.0a0
3838
- pytest
3939
- pytest-cov
4040
- pytest-xdist
4141
- python>=3.11
4242
- rapids-build-backend>=0.4.0,<0.5.0.dev0
4343
- rapids-logger==0.2.*,>=0.0.0a0
44-
- rapids-xgboost==26.6.*,>=0.0.0a0
44+
- rapids-xgboost==26.4.*,>=0.0.0a0
4545
- scikit-build-core>=0.11.0
4646
- scikit-learn>=1.5
4747
- sphinx

‎conda/environments/all_cuda-129_arch-x86_64.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,23 @@ dependencies:
2525
- libcurand-dev
2626
- libcusolver-dev
2727
- libcusparse-dev
28-
- libraft==26.6.*,>=0.0.0a0
29-
- librmm==26.6.*,>=0.0.0a0
28+
- libraft==26.4.*,>=0.0.0a0
29+
- librmm==26.4.*,>=0.0.0a0
3030
- ninja
3131
- numpy>=1.23,<3.0a0
3232
- numpydoc
3333
- packaging
3434
- pandas
3535
- pre-commit
3636
- pydata-sphinx-theme
37-
- pylibraft==26.6.*,>=0.0.0a0
37+
- pylibraft==26.4.*,>=0.0.0a0
3838
- pytest
3939
- pytest-cov
4040
- pytest-xdist
4141
- python>=3.11
4242
- rapids-build-backend>=0.4.0,<0.5.0.dev0
4343
- rapids-logger==0.2.*,>=0.0.0a0
44-
- rapids-xgboost==26.6.*,>=0.0.0a0
44+
- rapids-xgboost==26.4.*,>=0.0.0a0
4545
- scikit-build-core>=0.11.0
4646
- scikit-learn>=1.5
4747
- sphinx

‎conda/environments/all_cuda-131_arch-aarch64.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,23 @@ dependencies:
2525
- libcurand-dev
2626
- libcusolver-dev
2727
- libcusparse-dev
28-
- libraft==26.6.*,>=0.0.0a0
29-
- librmm==26.6.*,>=0.0.0a0
28+
- libraft==26.4.*,>=0.0.0a0
29+
- librmm==26.4.*,>=0.0.0a0
3030
- ninja
3131
- numpy>=1.23,<3.0a0
3232
- numpydoc
3333
- packaging
3434
- pandas
3535
- pre-commit
3636
- pydata-sphinx-theme
37-
- pylibraft==26.6.*,>=0.0.0a0
37+
- pylibraft==26.4.*,>=0.0.0a0
3838
- pytest
3939
- pytest-cov
4040
- pytest-xdist
4141
- python>=3.11
4242
- rapids-build-backend>=0.4.0,<0.5.0.dev0
4343
- rapids-logger==0.2.*,>=0.0.0a0
44-
- rapids-xgboost==26.6.*,>=0.0.0a0
44+
- rapids-xgboost==26.4.*,>=0.0.0a0
4545
- scikit-build-core>=0.11.0
4646
- scikit-learn>=1.5
4747
- sphinx

‎conda/environments/all_cuda-131_arch-x86_64.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,23 @@ dependencies:
2525
- libcurand-dev
2626
- libcusolver-dev
2727
- libcusparse-dev
28-
- libraft==26.6.*,>=0.0.0a0
29-
- librmm==26.6.*,>=0.0.0a0
28+
- libraft==26.4.*,>=0.0.0a0
29+
- librmm==26.4.*,>=0.0.0a0
3030
- ninja
3131
- numpy>=1.23,<3.0a0
3232
- numpydoc
3333
- packaging
3434
- pandas
3535
- pre-commit
3636
- pydata-sphinx-theme
37-
- pylibraft==26.6.*,>=0.0.0a0
37+
- pylibraft==26.4.*,>=0.0.0a0
3838
- pytest
3939
- pytest-cov
4040
- pytest-xdist
4141
- python>=3.11
4242
- rapids-build-backend>=0.4.0,<0.5.0.dev0
4343
- rapids-logger==0.2.*,>=0.0.0a0
44-
- rapids-xgboost==26.6.*,>=0.0.0a0
44+
- rapids-xgboost==26.4.*,>=0.0.0a0
4545
- scikit-build-core>=0.11.0
4646
- scikit-learn>=1.5
4747
- sphinx

‎conda/environments/clang_tidy_cuda-129_arch-x86_64.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ dependencies:
2020
- libcurand-dev
2121
- libcusolver-dev
2222
- libcusparse-dev
23-
- libraft-headers==26.6.*,>=0.0.0a0
24-
- librmm==26.6.*,>=0.0.0a0
23+
- libraft-headers==26.4.*,>=0.0.0a0
24+
- librmm==26.4.*,>=0.0.0a0
2525
- llvm-openmp==15.0.7
2626
- ninja
2727
- sysroot_linux-64==2.28

0 commit comments

Comments
 (0)