Skip to content

Commit ff59189

Browse files
bdiceclaude
andauthored
Use main branch (#601)
## Summary - Updates workflows to use `main` branch instead of `branch-25.12` for shared-workflows - Updates manifest to use `main` branch for repos and ucxx - Updates checkout-same-branch.sh to only convert UCX branches matching `release/YY.MM` pattern - Simplifies release script by removing branch-specific version updates xref: rapidsai/build-planning#224 --------- Co-authored-by: Claude <[email protected]>
1 parent 02444e5 commit ff59189

File tree

8 files changed

+11
-18
lines changed

8 files changed

+11
-18
lines changed

.github/workflows/build-all-rapids-repos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
if: needs.check-event.outputs.ok == 'true'
2828
needs: check-event
2929
secrets: inherit
30-
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-25.12
30+
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@main
3131
permissions:
3232
actions: read
3333
packages: read

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ concurrency:
77
on:
88
push:
99
branches:
10-
- "branch-[0-9][0-9].[0-9][0-9]"
10+
- "main"
1111
tags:
1212
- "v[0-9][0-9].[0-9][0-9].[0-9][0-9]"
1313

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
workflow_dispatch:
99
push:
1010
branches:
11-
- "branch-[0-9][0-9].[0-9][0-9]"
11+
- "main"
1212
tags:
1313
- "v[0-9][0-9].[0-9][0-9].[0-9][0-9]"
1414

.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@branch-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 }}

ci/release/update-version.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,7 @@ for file in $(find .devcontainer -name devcontainer.json); do
4545
sed_runner "s@rapids-\${localWorkspaceFolderBasename}-[0-9.]*@rapids-\${localWorkspaceFolderBasename}-${NEXT_SHORT_TAG}@g" "${file}"
4646
done
4747

48-
sed_runner "s/branch-[[:digit:]]\{2\}\.[[:digit:]]\+/branch-${NEXT_SHORT_TAG}/g" ./features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
49-
sed_runner "s/branch-0.[[:digit:]]\+/branch-${NEXT_UCXX_SHORT_TAG}/g" ./features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
50-
5148
for file in $(find features -name devcontainer-feature.json); do
5249
tmp=$(mktemp)
5350
jq --arg ver "$NEXT_FULL_TAG_PEP440" '.version = $ver' "$file" > "$tmp" && mv "$tmp" "$file"
5451
done
55-
56-
# CI files
57-
for FILE in .github/workflows/*.yaml .github/workflows/*.yml; do
58-
sed_runner "/shared-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" "${FILE}"
59-
done

features/src/rapids-build-utils/devcontainer-feature.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "NVIDIA RAPIDS devcontainer build utilities",
33
"id": "rapids-build-utils",
4-
"version": "25.12.1",
4+
"version": "25.12.2",
55
"description": "A feature to install the RAPIDS devcontainer build utilities",
66
"containerEnv": {
77
"BASH_ENV": "/etc/bash.bash_env"

features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@ convert-ucx-branch() {
2424
normalized_branch="${custom_branch}"
2525

2626
if [[ "${repo}" == "ucx"* ]]; then
27-
RAPIDS_VERSION=$(echo "${custom_branch}" | awk '{split($0, a, "-"); print a[2]}')
28-
if [[ "${RAPIDS_VERSION}" =~ ^[0-9]{2}\.[0-9]{2}$ ]]; then
27+
# Only convert branches that match the pattern release/YY.MM
28+
if [[ "${custom_branch}" =~ ^release/[0-9]{2}\.[0-9]{2}$ ]]; then
29+
RAPIDS_VERSION=$(echo "${custom_branch}" | awk '{split($0, a, "/"); print a[2]}')
2930
# Get UCX version associated w/ RAPIDS version
3031
UCX_VERSION="$(curl -sL https://version.gpuci.io/rapids/${RAPIDS_VERSION})"
31-
normalized_branch="branch-${UCX_VERSION}"
32+
normalized_branch="release/${UCX_VERSION}"
3233
fi
3334
fi
3435

features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
x-git-defaults: &git_defaults
22
host: github
3-
tag: branch-25.12
3+
tag: main
44
upstream: rapidsai
55

66
x-rapids-build-backend-args: &rapids_build_backend_args |
@@ -28,7 +28,7 @@ repos:
2828

2929
- name: ucxx
3030
path: ucxx
31-
git: {<<: *git_defaults, repo: ucxx, tag: branch-0.47}
31+
git: {<<: *git_defaults, repo: ucxx, tag: main}
3232
cpp:
3333
- name: ucxx
3434
sub_dir: cpp

0 commit comments

Comments
 (0)