nf-core · skrakau · Nov 18, 2020 · Nov 18, 2020 · Nov 18, 2020 · Nov 18, 2020
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Miniconda
-        uses: goanpeca/setup-miniconda@v1.0.2
+        uses: conda-incubator/setup-miniconda@v2
         with:
           auto-update-conda: true
           python-version: 3.7

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Miniconda
-        uses: goanpeca/setup-miniconda@v1.0.2
+        uses: conda-incubator/setup-miniconda@v2
         with:
           auto-update-conda: true
           python-version: 3.7

@@ -26,38 +26,38 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Check if Dockerfile or Conda environment changed
-        uses: technote-space/get-diff-action@v1
+        uses: technote-space/get-diff-action@v4
         with:
-          PREFIX_FILTER: |
+          FILES: |
             Dockerfile
             environment.yml
 
       - name: Build new docker image
-        if: env.GIT_DIFF
-        run: docker build --no-cache . -t nfcore/mag:1.1.1
+        if: env.MATCHED_FILES
+        run: docker build --no-cache . -t nfcore/mag:dev
 
       - name: Pull docker image
-        if: ${{ !env.GIT_DIFF }}
+        if: ${{ !env.MATCHED_FILES }}
         run: |
           docker pull nfcore/mag:dev
-          docker tag nfcore/mag:dev nfcore/mag:1.1.1
+          docker tag nfcore/mag:dev nfcore/mag:dev
 
       - name: Check if BUSCO Dockerfile or Conda environment changed
-        uses: technote-space/get-diff-action@v1
+        uses: technote-space/get-diff-action@v4
         with:
-          PREFIX_FILTER: |
+          FILES: |
             containers/busco/Dockerfile
             containers/busco/environment.yml
 
       - name: Build new docker image for BUSCO
-        if: env.GIT_DIFF
-        run: docker build --no-cache ./containers/busco/ -t nfcore/magbusco:1.1.1
+        if: env.MATCHED_FILES
+        run: docker build --no-cache ./containers/busco/ -t nfcore/magbusco:dev
 
       - name: Pull docker image for BUSCO
-        if: ${{ !env.GIT_DIFF }}
+        if: ${{ !env.MATCHED_FILES }}
         run: |
           docker pull nfcore/magbusco:dev
-          docker tag nfcore/magbusco:dev nfcore/magbusco:1.1.1
+          docker tag nfcore/magbusco:dev nfcore/magbusco:dev
 
       - name: Install Nextflow
         run: |

@@ -3,6 +3,8 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v1.2.0dev - [date]
+
 ## v1.1.1 - 2019/11/10
 
 ### `Added`

@@ -7,10 +7,10 @@ COPY environment.yml /
 RUN conda env create --quiet -f /environment.yml && conda clean -a
 
 # Add conda installation dir to PATH (instead of doing 'conda activate')
-ENV PATH /opt/conda/envs/nf-core-mag-1.1.1/bin:$PATH
+ENV PATH /opt/conda/envs/nf-core-mag-1.2.0dev/bin:$PATH
 
 # Dump the details of the installed packages to a file for posterity
-RUN conda env export --name nf-core-mag-1.1.1 > nf-core-mag-1.1.1.yml
+RUN conda env export --name nf-core-mag-1.2.0dev > nf-core-mag-1.2.0dev.yml
 
 # Instruct R processes to use these empty files instead of clashing with a local version
 RUN touch .Rprofile

@@ -106,23 +106,23 @@ process {
     time = { check_max (8.h * task.attempt, 'time' ) }
   }
   withName: busco {
-    container = 'nfcore/magbusco:1.1.1'
+    container = 'nfcore/magbusco:dev'
     profiles {
       conda {
         conda = "$baseDir/containers/busco/environment.yml"
       }
     }
   }
   withName: busco_plot {
-    container = 'nfcore/magbusco:1.1.1'
+    container = 'nfcore/magbusco:dev'
     profiles {
       conda {
         conda = "$baseDir/containers/busco/environment.yml"
       }
     }
   }
   withName: get_busco_version {
-    container = 'nfcore/magbusco:1.1.1'
+    container = 'nfcore/magbusco:dev'
     profiles {
       conda {
         conda = "$baseDir/containers/busco/environment.yml"

@@ -11,10 +11,10 @@ RUN apt-get update
 RUN apt-get install -y libxt6
 
 # Add conda installation dir to PATH (instead of doing 'conda activate')
-ENV PATH /opt/conda/envs/nf-core-mag-busco-1.1.1/bin:$PATH
+ENV PATH /opt/conda/envs/nf-core-mag-busco-1.2.0dev/bin:$PATH
 
 # Dump the details of the installed packages to a file for posterity
-RUN conda env export --name nf-core-mag-busco-1.1.1 > nf-core-mag-busco-1.1.1.yml
+RUN conda env export --name nf-core-mag-busco-1.2.0dev > nf-core-mag-busco-1.2.0dev.yml
 
 # Instruct R processes to use these empty files instead of clashing with a local version
 RUN touch .Rprofile

@@ -1,6 +1,6 @@
 # You can use this file to create a conda environment for this pipeline:
 #   conda env create -f environment.yml
-name: nf-core-mag-busco-1.1.1
+name: nf-core-mag-busco-1.2.0dev
 channels:
   - conda-forge
   - bioconda

@@ -1,6 +1,6 @@
 # You can use this file to create a conda environment for this pipeline:
 #   conda env create -f environment.yml
-name: nf-core-mag-1.1.1
+name: nf-core-mag-1.2.0dev
 channels:
   - conda-forge
   - bioconda

@@ -94,7 +94,7 @@ params {
 
 // Container slug. Stable releases should specify release tag!
 // Developmental code should specify :dev
-process.container = 'nfcore/mag:1.1.1'
+process.container = 'nfcore/mag:dev'
 
 // Load base.config by default for all pipelines
 includeConfig 'conf/base.config'
@@ -175,7 +175,7 @@ manifest {
   description = 'Assembly, binning and annotation of metagenomes'
   mainScript = 'main.nf'
   nextflowVersion = '>=19.10.0'
-  version = '1.1.1'
+  version = '1.2.0dev'
 }
 
 // Function to ensure that resource requirements don't go beyond