Skip to content

Commit 13accea

Browse files
authored
Revert "Forward-merge release/25.12 into main" (#873)
Reverts #872
1 parent c4e76d4 commit 13accea

File tree

6 files changed

+27
-27
lines changed

6 files changed

+27
-27
lines changed

.github/workflows/build.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ concurrency:
3434
jobs:
3535
cpp-build:
3636
secrets: inherit
37-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@release/25.12
37+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@main
3838
with:
3939
build_type: ${{ inputs.build_type || 'branch' }}
4040
branch: ${{ inputs.branch }}
@@ -44,7 +44,7 @@ jobs:
4444
python-build:
4545
needs: [cpp-build]
4646
secrets: inherit
47-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@release/25.12
47+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@main
4848
with:
4949
build_type: ${{ inputs.build_type || 'branch' }}
5050
branch: ${{ inputs.branch }}
@@ -54,7 +54,7 @@ jobs:
5454
upload-conda:
5555
needs: [cpp-build, python-build]
5656
secrets: inherit
57-
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@release/25.12
57+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@main
5858
with:
5959
build_type: ${{ inputs.build_type || 'branch' }}
6060
branch: ${{ inputs.branch }}
@@ -64,7 +64,7 @@ jobs:
6464
if: github.ref_type == 'branch'
6565
needs: python-build
6666
secrets: inherit
67-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/25.12
67+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
6868
with:
6969
arch: "amd64"
7070
branch: ${{ inputs.branch }}
@@ -76,7 +76,7 @@ jobs:
7676
sha: ${{ inputs.sha }}
7777
wheel-build-cpp:
7878
secrets: inherit
79-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/25.12
79+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
8080
with:
8181
matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
8282
build_type: ${{ inputs.build_type || 'branch' }}
@@ -89,7 +89,7 @@ jobs:
8989
wheel-build-python:
9090
needs: wheel-build-cpp
9191
secrets: inherit
92-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/25.12
92+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
9393
with:
9494
build_type: ${{ inputs.build_type || 'branch' }}
9595
branch: ${{ inputs.branch }}
@@ -101,7 +101,7 @@ jobs:
101101
wheel-publish-cpp:
102102
needs: wheel-build-cpp
103103
secrets: inherit
104-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@release/25.12
104+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@main
105105
with:
106106
build_type: ${{ inputs.build_type || 'branch' }}
107107
branch: ${{ inputs.branch }}
@@ -112,7 +112,7 @@ jobs:
112112
wheel-publish-python:
113113
needs: wheel-build-python
114114
secrets: inherit
115-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@release/25.12
115+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@main
116116
with:
117117
build_type: ${{ inputs.build_type || 'branch' }}
118118
branch: ${{ inputs.branch }}

.github/workflows/pr.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- wheel-python-tests
2828
- telemetry-setup
2929
secrets: inherit
30-
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@release/25.12
30+
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@main
3131
if: always()
3232
with:
3333
needs: ${{ toJSON(needs) }}
@@ -43,7 +43,7 @@ jobs:
4343
repo: kvikio
4444
changed-files:
4545
secrets: inherit
46-
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@release/25.12
46+
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@main
4747
with:
4848
files_yaml: |
4949
test_cpp:
@@ -86,28 +86,28 @@ jobs:
8686
checks:
8787
secrets: inherit
8888
needs: telemetry-setup
89-
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@release/25.12
89+
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@main
9090
with:
9191
ignored_pr_jobs: telemetry-summarize
9292
conda-cpp-build:
9393
needs: checks
9494
secrets: inherit
95-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@release/25.12
95+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@main
9696
with:
9797
build_type: pull-request
9898
script: ci/build_cpp.sh
9999
conda-cpp-tests:
100100
needs: [conda-cpp-build, changed-files]
101101
secrets: inherit
102-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@release/25.12
102+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@main
103103
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp
104104
with:
105105
build_type: pull-request
106106
script: ci/test_cpp.sh
107107
conda-java-tests:
108108
needs: conda-cpp-build
109109
secrets: inherit
110-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/25.12
110+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
111111
with:
112112
build_type: pull-request
113113
node_type: "gpu-l4-latest-1"
@@ -117,22 +117,22 @@ jobs:
117117
conda-python-build:
118118
needs: conda-cpp-build
119119
secrets: inherit
120-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@release/25.12
120+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@main
121121
with:
122122
build_type: pull-request
123123
script: ci/build_python.sh
124124
conda-python-tests:
125125
needs: [conda-python-build, changed-files]
126126
secrets: inherit
127-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@release/25.12
127+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@main
128128
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
129129
with:
130130
build_type: pull-request
131131
script: ci/test_python.sh
132132
docs-build:
133133
needs: conda-python-build
134134
secrets: inherit
135-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/25.12
135+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
136136
with:
137137
build_type: pull-request
138138
node_type: "gpu-l4-latest-1"
@@ -142,7 +142,7 @@ jobs:
142142
devcontainer:
143143
needs: telemetry-setup
144144
secrets: inherit
145-
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@release/25.12
145+
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@main
146146
with:
147147
arch: '["amd64", "arm64"]'
148148
cuda: '["13.0"]'
@@ -160,7 +160,7 @@ jobs:
160160
sccache --show-adv-stats | tee telemetry-artifacts/sccache-stats.txt;
161161
wheel-cpp-build:
162162
secrets: inherit
163-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/25.12
163+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
164164
with:
165165
matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
166166
build_type: pull-request
@@ -170,7 +170,7 @@ jobs:
170170
wheel-python-build:
171171
needs: wheel-cpp-build
172172
secrets: inherit
173-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/25.12
173+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
174174
with:
175175
build_type: pull-request
176176
script: ci/build_wheel_python.sh
@@ -179,7 +179,7 @@ jobs:
179179
wheel-python-tests:
180180
needs: [wheel-python-build, changed-files]
181181
secrets: inherit
182-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/25.12
182+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@main
183183
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
184184
with:
185185
build_type: pull-request

.github/workflows/test.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ on:
2525
jobs:
2626
cpp-tests:
2727
secrets: inherit
28-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@release/25.12
28+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@main
2929
with:
3030
build_type: ${{ inputs.build_type }}
3131
branch: ${{ inputs.branch }}
@@ -34,7 +34,7 @@ jobs:
3434
sha: ${{ inputs.sha }}
3535
python-tests:
3636
secrets: inherit
37-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@release/25.12
37+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@main
3838
with:
3939
build_type: ${{ inputs.build_type }}
4040
branch: ${{ inputs.branch }}
@@ -43,7 +43,7 @@ jobs:
4343
sha: ${{ inputs.sha }}
4444
conda-java-tests:
4545
secrets: inherit
46-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/25.12
46+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
4747
with:
4848
build_type: ${{ inputs.build_type }}
4949
branch: ${{ inputs.branch }}

.github/workflows/trigger-breaking-change-alert.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
trigger-notifier:
1313
if: contains(github.event.pull_request.labels.*.name, 'breaking')
1414
secrets: inherit
15-
uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@release/25.12
15+
uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@main
1616
with:
1717
sender_login: ${{ github.event.sender.login }}
1818
sender_avatar: ${{ github.event.sender.avatar_url }}

RAPIDS_BRANCH

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

cpp/examples/downstream/cmake/get_kvikio.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ function(find_and_configure_kvikio MIN_VERSION)
1313
VERSION ${MIN_VERSION}
1414
GIT_REPOSITORY
1515
https://github.com/rapidsai/kvikio.git
16-
GIT_TAG release/25.12
16+
GIT_TAG main
1717
GIT_SHALLOW
1818
TRUE
1919
SOURCE_SUBDIR

0 commit comments

Comments
 (0)