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

Ignore order of packages and channels in build requests #474

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 7 additions & 3 deletions src/main/groovy/io/seqera/wave/util/ContainerHelper.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,17 @@ class ContainerHelper {
// parse the attribute as a conda file path *and* append the base packages if any
// note 'channel' is null, because they are expected to be provided in the conda file
final decoded = decodeBase64OrFail(req.packages.environment, 'packages.envFile')
return condaEnvironmentToCondaYaml(decoded, req.packages.channels)
// order is not relevant, so sorting to improve caching
List<String> sortedChannels = req.packages.channels?.sort()
return condaEnvironmentToCondaYaml(decoded, sortedChannels)
}

if ( req.packages.entries && !condaLockFile(req.packages.entries)) {
// create a minimal conda file with package spec from user input
final String packages = req.packages.entries.join(' ')
return condaPackagesToCondaYaml(packages, req.packages.channels)
// order is not relevant, so sorting to improve caching
List<String> sortedPackages = req.packages.entries.sort()
List<String> sortedChannels = req.packages.channels?.sort()
return condaPackagesToCondaYaml(sortedPackages.join(' '), sortedChannels)
}

return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,8 @@ class ContainerHelperTest extends Specification {
channels:
- defaults
dependencies:
- this
- that
- this
'''.stripIndent()
}

Expand Down