Skip to content

cut the new branch from release branch, then rebase upstream/master to pull the new commits from master to the new branch. #2629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yliaog wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −2
Open

cut the new branch from release branch, then rebase upstream/master to pull the new commits from master to the new branch. #2629

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scripts/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down