Skip to content

support testing with serverContext on teamCity #1050

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

Merged
merged 8 commits into from
Apr 23, 2025
Merged

Conversation

labkey-chrisj
Copy link
Contributor

Rationale

This change accompanies the changes made in LabKey/gradlePlugin#231 to support configuring teamCity runs to use a contextPath
Github story: https://github.com/LabKey/kanban/issues/664

Related Pull Requests

updates to gradle plug-in: LabKey/gradlePlugin#231

Changes

updates the gradle plug-in version

Copy link
Member

@labkey-tchad labkey-tchad left a comment

Choose a reason for hiding this comment

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

You downgraded a bunch of dependencies somehow. don't do that

@labkey-chrisj
Copy link
Contributor Author

labkey-chrisj commented Apr 22, 2025

You downgraded a bunch of dependencies somehow. don't do that

Yikes. Pushed a change to align with right-now develop

#context.contextPath=/labkey
#context.contextPath=@@contextPath@@
Copy link
Member

Choose a reason for hiding this comment

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

This file (server/configs/webapps/embedded/config/application.properties) is the one we bundle with distributions. TeamCity doesn't care about it. Changing this probably won't cause any trouble but folks might have scripts that depend on the current text. Let's leave it as is; not worth the risk IMO.

Copy link
Contributor Author

@labkey-chrisj labkey-chrisj Apr 23, 2025

Choose a reason for hiding this comment

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

If that change isn't there, I worry the plugin won't uncomment that line. It does this check:
(DoThenSetup.groovy line 110)
if (configProperties.containsKey("contextPath") && line.contains("=@@contextPath")) { line = line.replace("#context.", "context.") }

If I undo this change, I think I'll have to check differently or else we don't effectively configure the server for the run.
...as I review my changes and the results, it's the one at server/configs/application.properties that seems to have resolved the problem of that line not being uncommented. I'll try reverting that change in the one at server/configs/webapps/embedded/config/ to see if it still works

(edit: it does work.)

@labkey-chrisj labkey-chrisj merged commit bafbb28 into develop Apr 23, 2025
3 checks passed
@labkey-chrisj labkey-chrisj deleted the fb_serverContext branch April 23, 2025 21:21
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