Add appServicesRootDir attribute gradle should generally use instead … #6530
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
…of rootDir. The intent is that this will be the same as `rootDir` when in app-services, but magically turn into the root of the app-services tree once in mozilla-central.
mhammond
force-pushed
the
push-zoqyqpnuwzkk
branch
from
e5a4355 to
326c95c
Compare
mhammond
commented
Dec 19, 2024
| includeBuild('tools/nimbus-gradle-plugin') { | ||
| // We prefer `appServicesRootDir` over `rootDir` to help us on the path to the monorepo. | ||
| // (They are the same in app-services but different in moz-central) | ||
| def maybeAppServicesRootDir = new File(rootDir, "services/app-services") |
There was a problem hiding this comment.
Some of this probably highlights my poor groovy/gradle skills, but I couldn't work out a sane way to share this variable both out and inside setupProject, so this is what I came up with.
|
|
||
| if (gradle.rootProject.hasProperty("nightlyVersion")) { | ||
| if (gradle.hasProperty("mozconfig")) { |
There was a problem hiding this comment.
Get something sane from a build in m-c - not clear how (or even if) we need a dedicated version string once landed.
| @@ -2,9 +2,8 @@ plugins { | |||
| alias libs.plugins.gradle.python.envs | |||
| } | |||
|
|
|||
| apply from: "$rootDir/build-scripts/component-common.gradle" | |||
| apply from: "$rootDir/build-scripts/protobuf-common.gradle" | |||
There was a problem hiding this comment.
places no longer needs protobuf.
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.
…of rootDir.
The intent is that this will be the same as
rootDirwhen in app-services, but magically turn into the root of the app-services tree once in mozilla-central.The intent here is to avoid needing to touch these files after "vendoring" into m-c. @rvandermeulen does this make sense to you?