Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix incorrect Gradle root build directory location #11976

Merged
merged 1 commit into from Jan 23, 2020
Merged

Conversation

melix
Copy link
Contributor

@melix melix commented Jan 22, 2020

Context

Fixes #11971

@melix melix added this to the 6.1.1 milestone Jan 22, 2020
@melix melix requested a review from ljacomet January 22, 2020 17:05
@melix melix self-assigned this Jan 22, 2020
@melix
Copy link
Contributor Author

melix commented Jan 22, 2020

I also have prepared a branch merging into master because it's not trivial merge.

@@ -334,8 +337,10 @@ RepositoryBlacklister createRepositoryBlacklister() {
return new ConnectionFailureRepositoryBlacklister();
}

StartParameterResolutionOverride createStartParameterResolutionOverride(StartParameter startParameter) {
return new StartParameterResolutionOverride(startParameter);
StartParameterResolutionOverride createStartParameterResolutionOverride(StartParameter startParameter, BuildLayoutFactory buildLayoutFactory) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you use BuildLayout here? It should be a build scope service created in this same way.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope, BuildLayout is not available at this stage.

Copy link
Member

@big-guy big-guy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are there any integration tests that check that the verification checks work from subprojects? Was there also a problem here where we wouldn't honor the verification file if the build was run from a subproject?

@melix
Copy link
Contributor Author

melix commented Jan 22, 2020

Verification is not public in 6.1 so it doesn't matter really.

This would cause a couple of bugs:

   - a `gradle` directory would be created for each build even if
they didn't have one
   - a `gradle` directory would be created for subprojects if the
gradle command was executed from this directory (#11971)

In addition, this would cause the verification metadata file to be
ignored if running from a subproject directory.
Copy link
Member

@ljacomet ljacomet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM as a fix for 6.1 👍

@melix melix merged commit 6c84a09 into release Jan 23, 2020
@melix melix deleted the cc/dm/issue-11971 branch January 23, 2020 14:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants