diff --git a/build.gradle b/build.gradle index e11aee694..2ed5d3d96 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ dependencies { implementation("jakarta.persistence:jakarta.persistence-api:3.0.0") api 'io.seqera:lib-mail:1.0.0' api 'io.seqera:wave-api:0.12.0' - api 'io.seqera:wave-utils:0.13.1' + api 'io.seqera:wave-utils:0.14.0' implementation("io.micronaut:micronaut-http-client") implementation("io.micronaut:micronaut-jackson-databind") diff --git a/src/main/groovy/io/seqera/wave/service/logs/BuildLogServiceImpl.groovy b/src/main/groovy/io/seqera/wave/service/logs/BuildLogServiceImpl.groovy index cabf41455..65a81b764 100644 --- a/src/main/groovy/io/seqera/wave/service/logs/BuildLogServiceImpl.groovy +++ b/src/main/groovy/io/seqera/wave/service/logs/BuildLogServiceImpl.groovy @@ -53,9 +53,9 @@ import static org.apache.commons.lang3.StringUtils.strip @Requires(property = 'wave.build.logs.bucket') class BuildLogServiceImpl implements BuildLogService { - private static final String CONDA_LOCK_START = ">>>>>>> CONDA_LOCK_START" + private static final String CONDA_LOCK_START = ">> CONDA_LOCK_START" - private static final String CONDA_LOCK_END = "<<<<<<< CONDA_LOCK_END" + private static final String CONDA_LOCK_END = "<< CONDA_LOCK_END" @Inject @Named('build-logs') diff --git a/src/test/groovy/io/seqera/wave/service/logs/BuildLogsServiceTest.groovy b/src/test/groovy/io/seqera/wave/service/logs/BuildLogsServiceTest.groovy index 056c7d7f5..5b033fe94 100644 --- a/src/test/groovy/io/seqera/wave/service/logs/BuildLogsServiceTest.groovy +++ b/src/test/groovy/io/seqera/wave/service/logs/BuildLogsServiceTest.groovy @@ -43,12 +43,12 @@ class BuildLogsServiceTest extends Specification { def 'should remove conda lockfile from logs' () { def logs = """ #9 12.23 logs.... - #10 12.24 >>>>>>> CONDA_LOCK_START + #10 12.24 >> CONDA_LOCK_START #10 12.24 # This file may be used to create an environment using: #10 12.24 # \$ conda create --name --file #10 12.24 # platform: linux-aarch64 #10 12.24 @EXPLICIT - #10 12.25 <<<<<<< CONDA_LOCK_END + #10 12.25 << CONDA_LOCK_END #11 12.26 logs....""".stripIndent() def service = new BuildLogServiceImpl() @@ -76,12 +76,12 @@ class BuildLogsServiceTest extends Specification { def 'should extract conda lockfile' () { def logs = """ #9 12.23 logs.... - #10 12.24 >>>>>>> CONDA_LOCK_START + #10 12.24 >> CONDA_LOCK_START #10 12.24 # This file may be used to create an environment using: #10 12.24 # \$ conda create --name --file #10 12.24 # platform: linux-aarch64 #10 12.24 @EXPLICIT - #10 12.25 <<<<<<< CONDA_LOCK_END + #10 12.25 << CONDA_LOCK_END #11 12.26 logs....""".stripIndent() def service = new BuildLogServiceImpl()