diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3a9aaff1..be6026ce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,13 +34,13 @@ jobs: - name: Build new docker image if: env.GIT_DIFF - run: docker build --no-cache . -t nfcore/mag:dev + run: docker build --no-cache . -t nfcore/mag:1.1.1 - name: Pull docker image if: ${{ !env.GIT_DIFF }} run: | docker pull nfcore/mag:dev - docker tag nfcore/mag:dev nfcore/mag:dev + docker tag nfcore/mag:dev nfcore/mag:1.1.1 - name: Check if BUSCO Dockerfile or Conda environment changed uses: technote-space/get-diff-action@v1 @@ -51,13 +51,13 @@ jobs: - name: Build new docker image for BUSCO if: env.GIT_DIFF - run: docker build --no-cache ./containers/busco/ -t nfcore/magbusco:dev + run: docker build --no-cache ./containers/busco/ -t nfcore/magbusco:1.1.1 - name: Pull docker image for BUSCO if: ${{ !env.GIT_DIFF }} run: | docker pull nfcore/magbusco:dev - docker tag nfcore/magbusco:dev nfcore/magbusco:dev + docker tag nfcore/magbusco:dev nfcore/magbusco:1.1.1 - name: Install Nextflow run: | diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e4366de..65bf19f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ 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` diff --git a/Dockerfile b/Dockerfile index 9d26d33f..8539fca6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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.2.0dev/bin:$PATH +ENV PATH /opt/conda/envs/nf-core-mag-1.1.1/bin:$PATH # Dump the details of the installed packages to a file for posterity -RUN conda env export --name nf-core-mag-1.2.0dev > nf-core-mag-1.2.0dev.yml +RUN conda env export --name nf-core-mag-1.1.1 > nf-core-mag-1.1.1.yml # Instruct R processes to use these empty files instead of clashing with a local version RUN touch .Rprofile diff --git a/conf/base.config b/conf/base.config index b50deba1..62a80482 100644 --- a/conf/base.config +++ b/conf/base.config @@ -106,7 +106,7 @@ process { time = { check_max (8.h * task.attempt, 'time' ) } } withName: busco { - container = 'nfcore/magbusco:dev' + container = 'nfcore/magbusco:1.1.1' profiles { conda { conda = "$baseDir/containers/busco/environment.yml" @@ -114,7 +114,7 @@ process { } } withName: busco_plot { - container = 'nfcore/magbusco:dev' + container = 'nfcore/magbusco:1.1.1' profiles { conda { conda = "$baseDir/containers/busco/environment.yml" @@ -122,7 +122,7 @@ process { } } withName: get_busco_version { - container = 'nfcore/magbusco:dev' + container = 'nfcore/magbusco:1.1.1' profiles { conda { conda = "$baseDir/containers/busco/environment.yml" diff --git a/containers/busco/Dockerfile b/containers/busco/Dockerfile index 6ae5f62d..99f42299 100644 --- a/containers/busco/Dockerfile +++ b/containers/busco/Dockerfile @@ -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.2.0dev/bin:$PATH +ENV PATH /opt/conda/envs/nf-core-mag-busco-1.1.1/bin:$PATH # Dump the details of the installed packages to a file for posterity -RUN conda env export --name nf-core-mag-busco-1.2.0dev > nf-core-mag-busco-1.2.0dev.yml +RUN conda env export --name nf-core-mag-busco-1.1.1 > nf-core-mag-busco-1.1.1.yml # Instruct R processes to use these empty files instead of clashing with a local version RUN touch .Rprofile diff --git a/containers/busco/environment.yml b/containers/busco/environment.yml index 56a27e68..c6ff4c0d 100644 --- a/containers/busco/environment.yml +++ b/containers/busco/environment.yml @@ -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.2.0dev +name: nf-core-mag-busco-1.1.1 channels: - conda-forge - bioconda diff --git a/environment.yml b/environment.yml index bddeffa5..2f86ff2e 100644 --- a/environment.yml +++ b/environment.yml @@ -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.2.0dev +name: nf-core-mag-1.1.1 channels: - conda-forge - bioconda diff --git a/nextflow.config b/nextflow.config index 1fb65ed8..77164102 100644 --- a/nextflow.config +++ b/nextflow.config @@ -94,7 +94,7 @@ params { // Container slug. Stable releases should specify release tag! // Developmental code should specify :dev -process.container = 'nfcore/mag:dev' +process.container = 'nfcore/mag:1.1.1' // 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.2.0dev' + version = '1.1.1' } // Function to ensure that resource requirements don't go beyond