build: support older git versions to detect current branch #2415
Conversation
This file contains hidden or 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
Contributor
|
LGTM |
youngnick
approved these changes
Apr 6, 2020
Member
youngnick
left a comment
There was a problem hiding this comment.
LGTM with one small question.
Codecov Report
@@ Coverage Diff @@
## master #2415 +/- ##
==========================================
- Coverage 77.46% 77.42% -0.04%
==========================================
Files 66 66
Lines 5423 5423
==========================================
- Hits 4201 4199 -2
- Misses 1132 1133 +1
- Partials 90 91 +1
Continue to review full report at Codecov.
|
417d64e to
8af4315
Compare
Ubuntu 18.04 has git version 2.17.1 which doesn't have the --show-current flag available (It's in a newer version of git). This causes builds to throw an error when the makefile looks for the current branch. Go back to the old method of parsing `git branch` output to get the current branch. This fixes projectcontour#2414. Signed-off-by: James Peach <[email protected]>
Contributor
Author
|
Sigh, Travis builds do this: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Ubuntu 18.04 has git version 2.17.1 which doesn't have the --show-current
flag available (It's in a newer version of git). This causes builds to
throw an error when the makefile looks for the current branch. Go back to
the old method of parsing
git branchoutput to get the current branch.This fixes #2414.
Signed-off-by: James Peach [email protected]