Skip to content

Commit 2c4f434

Browse files
authored
Revert "Forward-merge release/25.12 into main" (#2147)
Reverts #2146
1 parent d28ed9f commit 2c4f434

File tree

6 files changed

+26
-26
lines changed

6 files changed

+26
-26
lines changed

.github/workflows/build.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
cpp-build:
5252
needs: [telemetry-setup]
5353
secrets: inherit
54-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@release/25.12
54+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@main
5555
with:
5656
build_type: ${{ inputs.build_type || 'branch' }}
5757
branch: ${{ inputs.branch }}
@@ -61,7 +61,7 @@ jobs:
6161
python-build:
6262
needs: [telemetry-setup, cpp-build]
6363
secrets: inherit
64-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@release/25.12
64+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@main
6565
with:
6666
build_type: ${{ inputs.build_type || 'branch' }}
6767
branch: ${{ inputs.branch }}
@@ -71,7 +71,7 @@ jobs:
7171
upload-conda:
7272
needs: [cpp-build, python-build]
7373
secrets: inherit
74-
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@release/25.12
74+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@main
7575
with:
7676
build_type: ${{ inputs.build_type || 'branch' }}
7777
branch: ${{ inputs.branch }}
@@ -81,7 +81,7 @@ jobs:
8181
if: github.ref_type == 'branch'
8282
needs: [python-build]
8383
secrets: inherit
84-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/25.12
84+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
8585
with:
8686
build_type: ${{ inputs.build_type || 'branch' }}
8787
branch: ${{ inputs.branch }}
@@ -94,7 +94,7 @@ jobs:
9494
wheel-build-cpp:
9595
needs: [telemetry-setup]
9696
secrets: inherit
97-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/25.12
97+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
9898
with:
9999
matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
100100
build_type: ${{ inputs.build_type || 'branch' }}
@@ -107,7 +107,7 @@ jobs:
107107
wheel-build-python:
108108
needs: [telemetry-setup, wheel-build-cpp]
109109
secrets: inherit
110-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/25.12
110+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
111111
with:
112112
build_type: ${{ inputs.build_type || 'branch' }}
113113
branch: ${{ inputs.branch }}
@@ -119,7 +119,7 @@ jobs:
119119
wheel-publish-cpp:
120120
needs: wheel-build-cpp
121121
secrets: inherit
122-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@release/25.12
122+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@main
123123
with:
124124
build_type: ${{ inputs.build_type || 'branch' }}
125125
branch: ${{ inputs.branch }}
@@ -130,7 +130,7 @@ jobs:
130130
wheel-publish-python:
131131
needs: wheel-build-python
132132
secrets: inherit
133-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@release/25.12
133+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@main
134134
with:
135135
build_type: ${{ inputs.build_type || 'branch' }}
136136
branch: ${{ inputs.branch }}

.github/workflows/pr.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- devcontainer
2424
- telemetry-setup
2525
secrets: inherit
26-
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@release/25.12
26+
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@main
2727
if: always()
2828
with:
2929
needs: ${{ toJSON(needs) }}
@@ -61,7 +61,7 @@ jobs:
6161
needs:
6262
- telemetry-setup
6363
secrets: inherit
64-
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@release/25.12
64+
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@main
6565
with:
6666
files_yaml: |
6767
test_cpp:
@@ -85,44 +85,44 @@ jobs:
8585
secrets: inherit
8686
needs:
8787
- telemetry-setup
88-
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@release/25.12
88+
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@main
8989
with:
9090
enable_check_generated_files: false
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-python-build:
108108
needs: conda-cpp-build
109109
secrets: inherit
110-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@release/25.12
110+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@main
111111
with:
112112
build_type: pull-request
113113
script: ci/build_python.sh
114114
conda-python-tests:
115115
needs: [conda-python-build, changed-files]
116116
secrets: inherit
117-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@release/25.12
117+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@main
118118
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
119119
with:
120120
build_type: pull-request
121121
script: ci/test_python.sh
122122
docs-build:
123123
needs: conda-python-build
124124
secrets: inherit
125-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/25.12
125+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
126126
with:
127127
build_type: pull-request
128128
node_type: "gpu-l4-latest-1"
@@ -132,7 +132,7 @@ jobs:
132132
wheel-build-cpp:
133133
needs: checks
134134
secrets: inherit
135-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/25.12
135+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
136136
with:
137137
matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
138138
build_type: pull-request
@@ -142,7 +142,7 @@ jobs:
142142
wheel-build-python:
143143
needs: wheel-build-cpp
144144
secrets: inherit
145-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/25.12
145+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
146146
with:
147147
build_type: pull-request
148148
script: ci/build_wheel_python.sh
@@ -151,7 +151,7 @@ jobs:
151151
wheel-tests:
152152
needs: [wheel-build-python, changed-files]
153153
secrets: inherit
154-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/25.12
154+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@main
155155
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
156156
with:
157157
build_type: pull-request
@@ -160,7 +160,7 @@ jobs:
160160
secrets: inherit
161161
needs:
162162
- telemetry-setup
163-
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@release/25.12
163+
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@main
164164
with:
165165
arch: '["amd64", "arm64"]'
166166
cuda: '["13.0"]'

.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
wheel-tests:
4545
secrets: inherit
46-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/25.12
46+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.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/versions.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# cmake-format: on
66
# =============================================================================
77

8-
set(RMM_TAG release/25.12)
8+
set(RMM_TAG main)

0 commit comments

Comments
 (0)