Skip to content
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

Jump to bottom

contrib: Improve start-release.sh script #13357

Merged
merged 1 commit into from
Oct 1, 2020
Merged

contrib: Improve start-release.sh script #13357

merged 1 commit into from
Oct 1, 2020

Conversation

joestringer
Copy link
Member

@joestringer joestringer commented Sep 30, 2020 •
edited

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.

@joestringer
contrib: Improve start-release.sh script
53f395e 
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>
@joestringer joestringer added needs-backport/1.6 release-note/misc This PR makes changes that have no direct user impact. labels Sep 30, 2020
@joestringer joestringer requested a review from a team as a code owner September 30, 2020 22:22
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.7.10 Sep 30, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.8.4 Sep 30, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.6.12 Sep 30, 2020
@joestringer joestringer removed this from Needs backport from master in 1.7.10 Sep 30, 2020
@joestringer joestringer removed this from Needs backport from master in 1.8.4 Sep 30, 2020
@joestringer joestringer removed this from Needs backport from master in 1.6.12 Sep 30, 2020
@joestringer joestringer added this to Needs backport from master in 1.7.11 Sep 30, 2020
@joestringer joestringer added this to Needs backport from master in 1.8.5 Sep 30, 2020
rolinh
rolinh requested changes Oct 1, 2020
View reviewed changes
Copy link
Member

@rolinh rolinh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fwiw, the backporter guide gives examples without the v prefix. So for consistency across helper scripts, I'd prefer being smarter here and sed 's/^v//' like we do for contrib/backporting/start-backport, effectively accepting both with and without v prefix.

@pchaigno
Copy link
Member

pchaigno commented Oct 1, 2020

Fwiw, the backporter guide gives examples without the v prefix. So for consistency across helper scripts, I'd prefer being smarter here and sed 's/^v//' like we do for contrib/backporting/start-backport, effectively accepting both with and without v prefix.

@rolinh Isn't that what line 55 does?

rolinh
rolinh approved these changes Oct 1, 2020
View reviewed changes
Copy link
Member

@rolinh rolinh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pchaigno My bad, indeed 🤦‍♂️

@rolinh rolinh merged commit b71cf0d into cilium:master Oct 1, 2020
@joestringer joestringer deleted the submit/fix-release-script branch October 1, 2020 18:20
@joestringer joestringer added this to Needs backport from master in 1.6.13 Oct 1, 2020
@errordeveloper errordeveloper mentioned this pull request Oct 2, 2020
Merged
@pchaigno pchaigno mentioned this pull request Oct 5, 2020
Merged
@qmonnet qmonnet mentioned this pull request Oct 7, 2020
Merged
@tklauser tklauser moved this from Needs backport from master to Backport done to v1.8 in 1.8.5 Oct 13, 2020
@tklauser tklauser moved this from Needs backport from master to Backport done to v1.7 in 1.7.11 Oct 13, 2020
@tklauser tklauser moved this from Needs backport from master to Backport done to v1.6 in 1.6.13 Oct 13, 2020
This was referenced Oct 28, 2020
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rolinh rolinh rolinh approved these changes

@pchaigno pchaigno pchaigno approved these changes

@christarazi christarazi christarazi approved these changes

Assignees
No one assigned
Labels
release-note/misc This PR makes changes that have no direct user impact.
Projects
No open projects
1.6.13
Backport done to v1.6
1.7.11
Backport done to v1.7
1.8.5
Backport done to v1.8
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@joestringer @pchaigno @rolinh @christarazi @gandro @errordeveloper @qmonnet