-
Notifications
You must be signed in to change notification settings - Fork 9
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
Allow TeamCity to disable embedded tomcat #695
Merged
Merged
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
settings.gradle
Outdated
@@ -96,7 +96,7 @@ import org.labkey.gradle.util.BuildUtils | |||
node in the tree with these leaves (e.g., 'server:modules:core' will create projects for ":server" | |||
":server:modules" and ":server:modules:core"). | |||
*/ | |||
if (hasProperty("useEmbeddedTomcat")) | |||
if (hasProperty("useEmbeddedTomcat") && useEmbeddedTomcat != "false") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you can use the BuildUtils
method here.
ignore 'external' directory that might get generated
labkey-susanh
approved these changes
Jan 31, 2024
…ties' into fb_embedded_useEmbeddedTomcatFalse
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.
Rationale
In order to make embedded tomcat the default, we need a way to turn it off for testing on TeamCity.
Related Pull Requests
useEmbeddedTomcat
anduseLocalBuild
to be turned off gradlePlugin#195Changes
useEmbeddedTomcat
flag