Skip to content

fix: strip stray leading blank line from extracted conda lock file #1082

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

Open
pinin4fjords wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: strip stray leading blank line from extracted conda lock file #1082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/main/groovy/io/seqera/wave/service/logs/BuildLogServiceImpl.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ class BuildLogServiceImpl implements BuildLogService {
}
return logs.substring(start + CONDA_LOCK_START.length(), end)
.replaceAll(/#\d+ \d+\.\d+\s*/, '')
.stripLeading()
}

String fetchValidCondaLock(String buildId) {
Expand Down
22 changes: 10 additions & 12 deletions src/test/groovy/io/seqera/wave/service/logs/BuildLogsServiceTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,11 @@ class BuildLogsServiceTest extends Specification implements AwsS3TestContainer {
def result = service.extractCondaLockFile(logs)

then:
result == """
# This file may be used to create an environment using:
# \$ conda create --name <env> --file <this file>
# platform: linux-aarch64
@EXPLICIT
""".stripIndent()
result == """# This file may be used to create an environment using:
# \$ conda create --name <env> --file <this file>
# platform: linux-aarch64
@EXPLICIT
"""
}

def 'should extract conda lockfile from s3' (){
Expand Down Expand Up @@ -155,12 +154,11 @@ class BuildLogsServiceTest extends Specification implements AwsS3TestContainer {
service.storeCondaLock(buildID, logs)

then:
service.fetchCondaLockString(buildID) == """
# This file may be used to create an environment using:
# \$ conda create --name <env> --file <this file>
# platform: linux-aarch64
@EXPLICIT
""".stripIndent()
service.fetchCondaLockString(buildID) == """# This file may be used to create an environment using:
# \$ conda create --name <env> --file <this file>
# platform: linux-aarch64
@EXPLICIT
"""
}

def 'should throw no exception when there is no conda lockfile in logs' (){
Expand Down
Loading