Fixed getting git metadata when started from a different dir to the project #385
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
…ferent directory and given a path to the repository.
gabrielfeo
reviewed
Apr 21, 2025
clayburn
approved these changes
Apr 21, 2025
| @@ -146,7 +146,7 @@ private void applyProjectPlugin(Project project, DevelocityAdapter develocity) { | |||
|
|
|||
| BuildScanAdapter buildScan = develocity.getBuildScan(); | |||
| customDevelocityConfig.configureBuildScanPublishing(buildScan); | |||
| CustomBuildScanEnhancements buildScanEnhancements = new CustomBuildScanEnhancements(develocity, providers, project.getGradle()); | |||
| CustomBuildScanEnhancements buildScanEnhancements = new CustomBuildScanEnhancements(develocity, providers, project.getGradle(), project.getRootDir().getAbsolutePath()); | |||
There was a problem hiding this comment.
Nitpick, but stylistically, I'd lean towards passing just the rootDir here as a a file, all the way into execAndGetStdOut have that be the only place where we need to care about -C
gabrielfeo
approved these changes
Apr 22, 2025
jprinet
approved these changes
Apr 23, 2025
| String gitCommitShortId = execAndGetStdOut("git", "rev-parse", "--short=8", "--verify", "HEAD"); | ||
| String gitBranchName = getGitBranchName(() -> execAndGetStdOut("git", "rev-parse", "--abbrev-ref", "HEAD")); | ||
| String gitStatus = execAndGetStdOut("git", "status", "--porcelain"); | ||
| String gitRepo = execAndGetStdOut(projectDir, "git", "config", "--get", "remote.origin.url"); |
There was a problem hiding this comment.
It seems an extra space got inserted before the variable definition 🤷♂️ (same for the 4 next lines)
|
|
||
| private CaptureGitMetadataAction(ProviderFactory providers, DevelocityAdapter develocity) { | ||
| private CaptureGitMetadataAction(File projectDir, ProviderFactory providers, DevelocityAdapter develocity) { |
There was a problem hiding this comment.
I feel aligning the argument order with the constructor of CustomBuildScanEnhancements would help to read the code. The ordering was unaligned before your change though.
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.
Fixed getting git data when the gradle build is started from a different directory and given a path to the repository. This can happen if the build is started with the
-p/--project-dirargument, or when using the GradleConnector as the main entrypoint - which is what is used by the VSCode gradle build server, added by gradle-java VSCode extension.To overcome this issue, I've added the
-C <root-project-path>argument when running git commands, which will take care of such cases.I will investigate and open similar PRs for other CCUD implementations if we want to add this, and this is approved.