From 937c5565bd10eefc4ffb2bac63a55400825c8cf1 Mon Sep 17 00:00:00 2001 From: yliao Date: Thu, 9 Jul 2026 21:47:31 +0000 Subject: [PATCH] cut the new branch from release branch, then rebase upstream/master to pull the new commits from master to the new branch. --- scripts/release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/release.sh b/scripts/release.sh index 4a6be4a0e2..9395f47bde 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -132,7 +132,7 @@ newbranch="$(echo "automated-release-of-${CLIENT_VERSION}-${remote_branch}" | se newbranchuniq="${newbranch}-$(date +%s)" declare -r newbranchuniq echo "+++ Creating local branch ${newbranchuniq}" -git checkout -b "${newbranchuniq}" "${remote_branch}" +git checkout -b "${newbranchuniq}" "upstream/master" # Get Kubernetes API versions old_client_version=$(python3 "scripts/constants.py" CLIENT_VERSION) @@ -143,7 +143,7 @@ echo "New Kubernetes API Version: $new_k8s_api_version" # If it's an actual release, pull master branch if [[ $CLIENT_VERSION != *"snapshot"* ]]; then - git pull -X theirs upstream master --no-edit + git pull -X theirs upstream release-"${CLIENT_VERSION%%.*}".0 --no-edit # Collect release notes from master branch if [[ $(git log ${remote_branch}..upstream/master | grep ^commit) ]]; then