Skip to content

[bot] Merge 24.5 to develop #294

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.

Sign up for GitHub

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
github-actions merged 3 commits into from
May 16, 2024
Merged

[bot] Merge 24.5 to develop #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51f1207
Escape `context.pipelineConfig` property for tests (#291)
labkey-tchad May 10, 2024
b34cdca
Merge 24.3 to 24.5
labkey-teamcity May 14, 2024
4f79845
Merge 24.5 to develop
labkey-teamcity May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions SequenceAnalysis/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ dependencies {
if (project.findProject(BuildUtils.getTestProjectPath(project.gradle)) != null && project.hasProperty("teamcity"))
{
project.evaluationDependsOn(BuildUtils.getTestProjectPath(project.gradle))
def configDir = "${ServerDeployExtension.getServerDeployDirectory(project)}/config"
def configDir = new File(ServerDeployExtension.getServerDeployDirectory(project), "config")
def testProject = project.findProject(BuildUtils.getTestProjectPath(project.gradle))
def createPipelineConfigTask = project.tasks.register("createPipelineConfig", Copy) {
Copy task ->
Expand All @@ -183,13 +183,9 @@ if (project.findProject(BuildUtils.getTestProjectPath(project.gradle)) != null &
return newLine

})
task.destinationDir = new File(configDir)
task.destinationDir = configDir

if (BuildUtils.useEmbeddedTomcat(project)) {
task.doFirst {
new File(new File(BuildUtils.getEmbeddedConfigPath(project)), "application.properties") << "\n${configDir}"
}

rootProject.allprojects {
task.mustRunAfter tasks.withType(DoThenSetup)
}
Expand All @@ -199,7 +195,8 @@ if (project.findProject(BuildUtils.getTestProjectPath(project.gradle)) != null &
dependsOn(createPipelineConfigTask)
if (BuildUtils.useEmbeddedTomcat(project)) {
it.doFirst {
new File(new File(BuildUtils.getEmbeddedConfigPath(project)), "application.properties") << "\ncontext.pipelineConfig=${configDir}"
new File(new File(BuildUtils.getEmbeddedConfigPath(project)), "application.properties")
<< "\ncontext.pipelineConfig=${configDir.getAbsolutePath().replace("\\", "\\\\")}"
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceRemoteIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,12 @@ private File setupConfigDir(File outDir) throws IOException

path = path.replaceAll("\\\\", "/");
line = line.replaceAll("@@SEQUENCEANALYSIS_TOOLS@@", path);
_log.info("Writing to pipelineConfig.xml: " + line);
}
else if (line.contains("@@WORK_DIR@@"))
{
line = line.replaceAll("@@WORK_DIR@@", outDir.getPath().replaceAll("\\\\", "/"));
_log.info("Writing to pipelineConfig.xml: " + line);
}

writer.println(line);
Expand Down Expand Up @@ -213,6 +215,8 @@ protected void executeJobRemote(File workDir, @Nullable File jobJson) throws IOE
ProcessBuilder pb = new ProcessBuilder(args);
pb.directory(workDir);

_log.info("Executing job in '" + pb.directory().getAbsolutePath() + "': " + String.join(" ", pb.command()));

Process proc;
try
{
Expand Down