Add scripts for tagging Velero releases #2592
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
enqueued to review tomorrow morning! |
skriss
previously requested changes
Jun 10, 2020
There was a problem hiding this comment.
@nrb thanks for putting this together! It'll definitely be helpful. The main issue I saw is that for a patch release, in between creating a release branch and creating a tag, the user will need to cherry-pick commits, so need to decide how to work that into the script(s).
|
@ashish-amarnath @carlisia I've marked this as ready for review, but let me know what you think of the tool's workflow. I'm aiming to make the process better, but probably not perfect on this go. |
nrb
added
the
kind/changelog-not-required
carlisia
reviewed
Jun 22, 2020
Signed-off-by: Nolan Brubaker <brubakern@vmware.com>
Signed-off-by: Nolan Brubaker <brubakern@vmware.com>
Signed-off-by: Nolan Brubaker <brubakern@vmware.com>
Signed-off-by: Nolan Brubaker <brubakern@vmware.com>
* Pause to allow for cherry-picking on the release branch before pushing it * Move master branch logic into an else statement * Correct typo Signed-off-by: Nolan Brubaker <brubakern@vmware.com>
|
@ashish-amarnath @carlisia Rebased! |
hack/release-tools/tag-release.sh
Outdated
Comment on lines
47
to
51
| # Ensure that we have a clean working tree before we let any changes happen, especially important for cutting release branches. | ||
| #if [[ -n $(git status --short) ]]; then | ||
| # echo "Your git working directory is dirty! Please clean up untracked files and stash any changes before proceeding." | ||
| # exit 3 | ||
| #fi |
There was a problem hiding this comment.
This should be uncommented to avoid publishing release built from local changes.
ashish-amarnath
suggested changes
Jul 7, 2020
Signed-off-by: Nolan Brubaker <brubakern@vmware.com>
carlisia
approved these changes
Jul 8, 2020
nrb
added a commit
to nrb/velero
that referenced
this pull request
Jul 13, 2020
* Add release tools Signed-off-by: Nolan Brubaker <brubakern@vmware.com> * Document the tag-release release tool Signed-off-by: Nolan Brubaker <brubakern@vmware.com> * Make sure the upstream used is correct Signed-off-by: Nolan Brubaker <brubakern@vmware.com> * Add copyright statement Signed-off-by: Nolan Brubaker <brubakern@vmware.com> * Address review feedback * Pause to allow for cherry-picking on the release branch before pushing it * Move master branch logic into an else statement * Correct typo Signed-off-by: Nolan Brubaker <brubakern@vmware.com> * Uncomment check for dirty git working tree Signed-off-by: Nolan Brubaker <brubakern@vmware.com>
ashish-amarnath
added a commit
that referenced
this pull request
Jul 13, 2020
* Adjust restic timeout and pod values up (#2696) * Adjust restic timeout and pod values up Signed-off-by: Nolan Brubaker <brubakern@vmware.com> * 🐛 Use CRD version prior to remap_crd_version backup item action (#2683) * 🐛 preserve crd version before remapping Signed-off-by: Ashish Amarnath <ashisham@vmware.com> * 🏃♂️ pass git state to build from makefile Signed-off-by: Ashish Amarnath <ashisham@vmware.com> * Add scripts for tagging Velero releases (#2592) * Add release tools Signed-off-by: Nolan Brubaker <brubakern@vmware.com> * Document the tag-release release tool Signed-off-by: Nolan Brubaker <brubakern@vmware.com> * Make sure the upstream used is correct Signed-off-by: Nolan Brubaker <brubakern@vmware.com> * Add copyright statement Signed-off-by: Nolan Brubaker <brubakern@vmware.com> * Address review feedback * Pause to allow for cherry-picking on the release branch before pushing it * Move master branch logic into an else statement * Correct typo Signed-off-by: Nolan Brubaker <brubakern@vmware.com> * Uncomment check for dirty git working tree Signed-off-by: Nolan Brubaker <brubakern@vmware.com> Co-authored-by: Ashish Amarnath <ashisham@vmware.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2472
Hopefully :)
I think there's some steps I may need to fix for the release branch logic, as I've not done that part. From what I can tell, this logic works well, but I want more eyes on this as I've played with it against a fake upstream that pointed to my own repo that I can't actually make a release against.