add more checks to build_release.py #7913
Closed
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
| if __name__ == '__main__': | ||
| parser = argparse.ArgumentParser(description='Builds and publishes a Elasticsearch Release') | ||
| parser.add_argument('--branch', '-b', metavar='master', default=get_current_branch(), | ||
| parser.add_argument('--branch', '-b', metavar='1.3', default=get_current_branch(), |
There was a problem hiding this comment.
Is this change intentional? Seems like the metavar should be something like "RELEASE_BRANCH".
There was a problem hiding this comment.
It was intentional; I just didn't think we would ever release from master directly :) But I agree a standin like RELEASE_BRANCH is better ... I'll switch.
|
Looks good. I added a couple minor suggestions. +1 to using a fresh checkout. When helping with the 1.3.2 release, I noticed this same problem of a full checkout magically showing up in a subdir. |
|
OK I folded in your feedback @rjernst (thank you!) and made a couple other small improvements... |
|
LGTM. |
mikemccand
added a commit
that referenced
this pull request
Oct 2, 2014
Don't insist on log file removal until after usage is printed. Some simple Python code improvements (x.find(y) != -1 --> y in x) Make sure the git area is "clean" (has no unpushed changes, has pulled all changes, has no untracked files) Add label color detail when creating next github version label. Closes #7913
mikemccand
added a commit
that referenced
this pull request
Oct 2, 2014
Don't insist on log file removal until after usage is printed. Some simple Python code improvements (x.find(y) != -1 --> y in x) Make sure the git area is "clean" (has no unpushed changes, has pulled all changes, has no untracked files) Add label color detail when creating next github version label. Closes #7913
clintongormley
added
:Delivery/Packaging
clintongormley
added
:Delivery/Build
mute
pushed a commit
to mute/elasticsearch
that referenced
this pull request
Jul 29, 2015
Don't insist on log file removal until after usage is printed. Some simple Python code improvements (x.find(y) != -1 --> y in x) Make sure the git area is "clean" (has no unpushed changes, has pulled all changes, has no untracked files) Add label color detail when creating next github version label. Closes elastic#7913
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.
When I ran build_release.py to release 1.3.3 I noticed the git clone I
was working from had an extra "elasticsearch" subdirectory (probably I
did this earlier) and git status said "# Your branch is ahead of
'origin/1.3' by 33 commits." which is spooky.
I ran "git clean -f", and Simon suggested "git fetch origin" and sure
enough that fixed "git status" to be "clean" again.
I think the release script should check to make sure there are no
untracked files in the area, there are no uncommitted changes, you
have all changes from origin, and you don't have any unpushed changes.
(Separately we should maybe upgrade the git on the build box ... it's
1.7.9.5 now.)
I tried to make these changes to build_release.py but likely messed it
up (git is ... magical to me).
It seems like it would be best overall if the script just made a fresh
clone of the branch for release? Seems spooky to reuse a clone from
one release to the next...
I also put in a few other cleanups that I noticed when building
1.3.3.