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

Allow TeamCity to disable embedded tomcat #695

Merged
merged 9 commits into from
Feb 2, 2024

Conversation

labkey-tchad
Copy link
Member

Rationale

In order to make embedded tomcat the default, we need a way to turn it off for testing on TeamCity.

Related Pull Requests

Changes

  • Update gradle plugin to get new handling of useEmbeddedTomcat flag

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")
Copy link
Contributor

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.

@labkey-tchad labkey-tchad merged commit 1573424 into develop Feb 2, 2024
2 of 4 checks passed
@labkey-tchad labkey-tchad deleted the fb_embedded_useEmbeddedTomcatFalse branch February 2, 2024 16:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants