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.

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

Refine tag-release.sh #4185

Merged
merged 1 commit into from
Sep 23, 2021
Merged

Conversation

reasonerjt
Copy link
Contributor

@reasonerjt reasonerjt commented Sep 22, 2021

This commit makes several changes to tag-release.sh according to the
change in release process:

  1. It will support a "ON_RELEASE_BRANCH" param passed via env variable.
    When it's set to "TRUE". The release will be created on the commit of
    branch like release-xxx. This enables us to create release branch
    before GA and tag RC release.
  2. It removes the code to push a new branch to upstream. This is
    because we decided to create branch manually. For patch releases, we
    will not push the change to release branch, instead, we will make
    sure the release branch has all commits cherrypicked BEFORE we run
    this script to tag the release.

After the change the script will focus on only tag the release, not
making other code change to release branches.

Signed-off-by: Daniel Jiang jiangd@vmware.com

Thank you for contributing to Velero!

Fixes #4174

Please indicate you've done the following:

This commit makes several changes to `tag-release.sh` according to the
change in release process:
1. It will support a "ON_RELEASE_BRANCH" param passed via env variable.
   When it's set to "TRUE". The release will be created on the commit of
   branch like `release-xxx`.  This enables us to create release branch
   before GA and tag RC release.
2. It removes the code to push a new branch to upstream.  This is
   because we decided to create branch manually.  For patch releases, we
   will not push the change to release branch, instead, we will make
   sure the release branch has all commits cherrypicked BEFORE we run
   this script to tag the release.

After the change the script will focus on only tag the release, not
making other code change to release branches.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
@reasonerjt
Copy link
Contributor Author

@zubron
I think it's OK to merge this only to main branch?
Let me know your thoughts.

@zubron
Copy link
Contributor

zubron commented Sep 22, 2021

@reasonerjt Yes, that seems fine to me since this script checks out the release branch as it runs 👍

Copy link
Contributor

@zubron zubron left a comment

Choose a reason for hiding this comment

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

Thanks for fixing this! It's always nice when you can make bash scripts shorter 😄

@reasonerjt reasonerjt added the kind/release-blocker Must fix issues for the coming release (milestone) label Sep 22, 2021
@reasonerjt reasonerjt added this to the v1.7.0 milestone Sep 22, 2021
@ywk253100 ywk253100 merged commit a6fca1d into vmware-tanzu:main Sep 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
has-changelog kind/release-blocker Must fix issues for the coming release (milestone)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix release script to create the release branch for the .0 release
3 participants