Skip to content

Commit

Permalink
contrib: Improve start-release.sh script
Browse files Browse the repository at this point in the history
Due to an extra `v` in the branch name, this script would fail with:

  $ ~/git/cilium/contrib/release/start-release.sh v1.6.12 128
  fatal: 'origin/vv1.6' is not a commit and a branch 'pr/prepare-v1.6.12' cannot be created from it

  Signal ERR caught!

  Traceback (line function script):
  62 main /home/joe/git/cilium/contrib/release/start-release.sh

Fix it.

While we're at it, update the instructions at the end for next
steps, since there's also now a `submit-backport.sh` script to send the
PR from the CLI.

Signed-off-by: Joe Stringer <joe@cilium.io>
  • Loading branch information
joestringer authored and rolinh committed Oct 1, 2020
1 parent 57d3473 commit b71cf0d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions contrib/release/start-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ main() {
local new_proj="$2"

git fetch $remote
git checkout -b pr/prepare-$version $remote/v$branch
git checkout -b pr/prepare-$version $remote/$branch

logecho "Updating VERSION, AUTHORS.md, $ACTS_YAML, helm templates"
echo $ersion > VERSION
Expand All @@ -72,7 +72,7 @@ main() {

logecho "Next steps:"
logecho "* Check all changes and add to a new commit"
logecho "* Push the PR to Github for review"
logecho "* Push the PR to Github for review ('submit-release.sh')"
logecho "* Close https://github.com/cilium/cilium/projects/$old_proj"
logecho "* (After PR merge) Use 'tag-release.sh' to prepare tags/release"

Expand Down

0 comments on commit b71cf0d

Please sign in to comment.