Fix/2.1.2 sec #1437
Merged
Fix/2.1.2 sec #1437
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
- send a readable error response from failed config set - trust but verify admin-supplied content in separate function - return specific error conditions for logging
git-describe may have changed output formats. The previous regex doesn't allow any trailing content, and git-describe always appends -g<SHA> unless abbrev=0 is added. This approach pulls out only the matching tag, leaving behind any trailing garbage from git-describe, and as a bonus allows tagging a commit from within a branch, and running a release directly from the branch without needing to re-check out the tag itself.
the released tarball should have -RCx in the name, but not in the extracted file, otherwise we can't simply rename the final artefact for our public release.
|
+1 once the tests pass (?) |
wohali
added a commit
that referenced
this pull request
Jul 16, 2018
Unfortuantely, #1437 brought in a build bug that caused dist tarballs to be created always using the last tag that could be found on the tree. This lead to `master` building tarballs labelled `2.1.0`. The new approach includes extensive comments to explain the approach, fixes the bug, and for an encore adds -dirty if you're building a CouchDB with local changes that aren't committed to git.
janl
pushed a commit
that referenced
this pull request
Jul 17, 2018
Unfortuantely, #1437 brought in a build bug that caused dist tarballs to be created always using the last tag that could be found on the tree. This lead to `master` building tarballs labelled `2.1.0`. The new approach includes extensive comments to explain the approach, fixes the bug, and for an encore adds -dirty if you're building a CouchDB with local changes that aren't committed to git.
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.
this branch brings the security fixes we’ve done for 2.1.2 to master.