Pin to release branch in manifest

ci/release/update-version.sh

@@ -76,13 +76,17 @@ NEXT_SHORT_TAG=${NEXT_MAJOR}.${NEXT_MINOR}
 NEXT_FULL_TAG=${NEXT_MAJOR}.${NEXT_MINOR}.${NEXT_PATCH}
 
 # Need to distutils-normalize the versions for some use cases
-NEXT_SHORT_TAG_PEP440=$(python -c "from packaging.version import Version; print(Version('${NEXT_SHORT_TAG}'))")
-NEXT_FULL_TAG_PEP440=$(python -c "from packaging.version import Version; print(Version('${NEXT_FULL_TAG}'))")
+NEXT_SHORT_TAG_PEP440=$(python3 -c "from packaging.version import Version; print(Version('${NEXT_SHORT_TAG}'))")
+NEXT_FULL_TAG_PEP440=$(python3 -c "from packaging.version import Version; print(Version('${NEXT_FULL_TAG}'))")
 
 # Log update context
 if [[ "${RUN_CONTEXT}" == "main" ]]; then
+    RAPIDS_BRANCH_NAME="main"
+    UCXX_BRANCH_NAME="main"
     echo "Preparing development branch update $CURRENT_TAG => $NEXT_FULL_TAG (targeting main branch)"
 elif [[ "${RUN_CONTEXT}" == "release" ]]; then
+    RAPIDS_BRANCH_NAME="release/${NEXT_SHORT_TAG}"
+    UCXX_BRANCH_NAME="release/$(curl -sL "https://version.gpuci.io/rapids/${NEXT_SHORT_TAG}")"
     echo "Preparing release branch update $CURRENT_TAG => $NEXT_FULL_TAG (targeting release/${NEXT_SHORT_TAG} branch)"
 fi
 
@@ -106,3 +110,6 @@ for file in $(find features -name devcontainer-feature.json); do
   tmp=$(mktemp)
   jq --arg ver "$NEXT_FULL_TAG_PEP440" '.version = $ver' "$file" > "$tmp" && mv "$tmp" "$file"
 done
+
+yq -i --yaml-fix-merge-anchor-to-spec ".x-git-defaults.tag = \"$RAPIDS_BRANCH_NAME\"" features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
+yq -i --yaml-fix-merge-anchor-to-spec "(.repos[] | select(.name == \"ucxx\") | .git.tag) = \"$UCXX_BRANCH_NAME\"" features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml

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

@@ -1,7 +1,7 @@
 {
   "name": "NVIDIA RAPIDS devcontainer build utilities",
   "id": "rapids-build-utils",
-  "version": "26.6.0",
+  "version": "26.6.1",
   "description": "A feature to install the RAPIDS devcontainer build utilities",
   "containerEnv": {
     "BASH_ENV": "/etc/bash.bash_env"

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

@@ -23,7 +23,7 @@ convert-ucx-branch() {
     custom_branch=$2
     normalized_branch="${custom_branch}"
 
-    if [[ "${repo}" == "ucx"* ]]; then
+    if [[ "${repo}" == "ucxx" ]]; then
         # Only convert branches that match the pattern release/YY.MM
         if [[ "${custom_branch}" =~ ^release/[0-9]{2}\.[0-9]{2}$ ]]; then
             RAPIDS_VERSION=$(echo "${custom_branch}" | awk '{split($0, a, "/"); print a[2]}')
@@ -68,7 +68,7 @@ checkout_same_branch() {
         local path="${!repo_path}";
 
         # Skip ucxx repositories when determining common branches
-        if [[ "${name}" == "ucx"* ]]; then
+        if [[ "${name}" == "ucxx" ]]; then
             continue;
         fi
 
@@ -158,7 +158,7 @@ checkout_same_branch() {
         local normalized_branch;
         normalized_branch=$(convert-ucx-branch "${repo_name_val}" "${branch}");
 
-        if [[ "${repo_name_val}" == "ucx"* ]]; then
+        if [[ "${repo_name_val}" == "ucxx" ]]; then
             echo "Using normalized branch '${normalized_branch}' for repository '${repo_name_val}'";
             branch="${normalized_branch}";
         fi