Fix conda channels order [ci fast]

Signed-off-by: Paolo Di Tommaso <paolo.ditommaso@gmail.com>
nextflow-io · Oct 11, 2023 · 6672c6d · 6672c6d
1 parent 882f369
commit 6672c6d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/plugins/nf-wave/src/main/io/seqera/wave/plugin/WaveClient.groovy b/plugins/nf-wave/src/main/io/seqera/wave/plugin/WaveClient.groovy
@@ -79,7 +79,7 @@ class WaveClient {
                         'Accept','application/vnd.docker.distribution.manifest.v2+json',
                         'Accept','application/vnd.docker.distribution.manifest.list.v2+json' }
 
-    private static final List<String> DEFAULT_CONDA_CHANNELS = ['seqera','bioconda','conda-forge','defaults']
+    private static final List<String> DEFAULT_CONDA_CHANNELS = ['seqera','conda-forge','bioconda','defaults']
 
     private static final String DEFAULT_SPACK_ARCH = 'x86_64'
 

diff --git a/plugins/nf-wave/src/test/io/seqera/wave/plugin/WaveClientTest.groovy b/plugins/nf-wave/src/test/io/seqera/wave/plugin/WaveClientTest.groovy
@@ -539,8 +539,8 @@ class WaveClientTest extends Specification {
         assets.condaFile.text == '''\
                 channels:
                 - seqera
-                - bioconda
                 - conda-forge
+                - bioconda
                 - defaults
                 dependencies:
                 - bioconda::rseqc=3.0.1
@@ -562,7 +562,7 @@ class WaveClientTest extends Specification {
         assets.containerFile == '''\
                 FROM mambaorg/micromamba:1.5.1
                 RUN \\
-                    micromamba install -y -n base -c seqera -c bioconda -c conda-forge -c defaults -f https://host.com/conda-lock.yml \\
+                    micromamba install -y -n base -c seqera -c conda-forge -c bioconda -c defaults -f https://host.com/conda-lock.yml \\
                     && micromamba install -y -n base conda-forge::procps-ng \\
                     && micromamba clean -a -y
                 USER root
@@ -737,8 +737,8 @@ class WaveClientTest extends Specification {
         assets.condaFile.text == '''\
                 channels:
                 - seqera
-                - bioconda
                 - conda-forge
+                - bioconda
                 - defaults
                 dependencies:
                 - salmon=1.2.3
@@ -760,7 +760,7 @@ class WaveClientTest extends Specification {
                 BootStrap: docker
                 From: mambaorg/micromamba:1.5.1
                 %post
-                    micromamba install -y -n base -c seqera -c bioconda -c conda-forge -c defaults -f https://host.com/lock-file.yaml
+                    micromamba install -y -n base -c seqera -c conda-forge -c bioconda -c defaults -f https://host.com/lock-file.yaml
                     micromamba install -y -n base conda-forge::procps-ng
                     micromamba clean -a -y
                 %environment