Don't fail the build if we're in a git worktree folder #6169
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
* Expand the way the build.gradle checks if we're in a git repo to also understand git-worktree checkouts
cmnbroad
reviewed
Sep 19, 2019
| @@ -125,6 +125,11 @@ def resolveLargeResourceStubFiles(largeResourcesFolder, buildPrerequisitesMessag | |||
| } | |||
| } | |||
|
|
|||
|
|
|||
| def looksLikeWereInAGitRepository(){ | |||
There was a problem hiding this comment.
Might be worth putting a comment here saying that its looking for either a git-dir or a worktree (or whatever the right names are) - I always get them mixed up.
| @@ -134,7 +139,7 @@ def ensureBuildPrerequisites(requiredJavaVersion, largeResourcesFolder, buildPre | |||
| "The ClassLoader obtained from the Java ToolProvider is null. " | |||
| + "A Java $requiredJavaVersion JDK must be installed. $buildPrerequisitesMessage") | |||
| } | |||
| if (!file(".git").isDirectory()) { | |||
| if (!looksLikeWereInAGitRepository()) { | |||
There was a problem hiding this comment.
Suggest changing the message below to something like:
"This doesn't appear to be a git folder. The GATK Github repository must be cloned using \"git clone\" to run the build. + "$buildPrerequisitesMessage")
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 is useful to me since I've been using
git worktreeto maintain copies of gatk for java 8 and 11 separately.Also, I recommend
git worktree