From cedbcf304fc282ee512de2139657e66e951ddf3b Mon Sep 17 00:00:00 2001 From: Haowei Cai Date: Mon, 25 Oct 2021 10:54:08 -0700 Subject: [PATCH] fixup! Collect release notes from master branch --- scripts/release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/release.sh b/scripts/release.sh index 778e15628..e2c3da6e7 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -140,8 +140,8 @@ if [[ $CLIENT_VERSION != *"snapshot"* ]]; then git pull -X theirs upstream master --no-edit # Collect release notes from master branch - start_sha=$(git log upstream/release-19.0..upstream/master | grep ^commit | tail -n1 | sed 's/commit //g') - end_sha=$(git log upstream/release-19.0..upstream/master | grep ^commit | head -n1 | sed 's/commit //g') + start_sha=$(git log ${remote_branch}..upstream/master | grep ^commit | tail -n1 | sed 's/commit //g') + end_sha=$(git log ${remote_branch}..upstream/master | grep ^commit | head -n1 | sed 's/commit //g') output="/tmp/python-master-relnote.md" release-notes --dependencies=false --org kubernetes-client --repo python --start-sha $start_sha --end-sha $end_sha --output $output sed -i 's/(\[\#/(\[kubernetes-client\/python\#/g' $output