From 4371681d2418516e692065374b05669d96868a02 Mon Sep 17 00:00:00 2001 From: Alexander Peltzer Date: Mon, 9 Dec 2019 16:03:34 +0100 Subject: [PATCH] Bump versions --- .github/workflows/ci.yml | 4 ++++ .travis.yml | 2 +- Dockerfile | 2 +- environment.yml | 2 +- nextflow.config | 4 ++-- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a671415d..3d3f9276 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,10 @@ jobs: export NXF_VER=${{ matrix.nxf_ver }} wget -qO- get.nextflow.io | bash sudo mv nextflow /usr/local/bin/ + - name: Download and tag image + run: | + docker pull nfcore/ampliseq:dev + docker tag nfcore/ampliseq:dev nfcore/ampliseq:1.1.1 - name: Run test run: | nextflow run ${GITHUB_WORKSPACE} -profile test,docker diff --git a/.travis.yml b/.travis.yml index 7f21f840..17b0035d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ before_install: - '[ $TRAVIS_PULL_REQUEST = "false" ] || [ $TRAVIS_BRANCH != "master" ] || ([ $TRAVIS_PULL_REQUEST_SLUG = $TRAVIS_REPO_SLUG ] && ([ $TRAVIS_PULL_REQUEST_BRANCH = "dev" ] || [ $TRAVIS_PULL_REQUEST_BRANCH = "patch" ]))' # Pull the docker image first so the test doesn't wait for this - docker pull nfcore/ampliseq:dev # Fake the tag locally so that the pipeline runs properly - - docker tag nfcore/ampliseq:dev nfcore/ampliseq:dev + - docker tag nfcore/ampliseq:dev nfcore/ampliseq:1.1.1 install: # Install Nextflow diff --git a/Dockerfile b/Dockerfile index be049791..fd69bf83 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM nfcore/base:1.7 LABEL description="Docker image containing all requirements for nf-core/ampliseq pipeline" COPY environment.yml / RUN conda env create -f /environment.yml && conda clean -a -ENV PATH /opt/conda/envs/nf-core-ampliseq-dev/bin:$PATH +ENV PATH /opt/conda/envs/nf-core-ampliseq-1.1.1/bin:$PATH ## Required to build the container properly RUN mkdir -p /root/.config/matplotlib RUN echo "backend : Agg" > /root/.config/matplotlib/matplotlibrc diff --git a/environment.yml b/environment.yml index 438182b5..ebfe4999 100644 --- a/environment.yml +++ b/environment.yml @@ -1,4 +1,4 @@ -name: nf-core-ampliseq-dev +name: nf-core-ampliseq-1.1.1 channels: - qiime2 - qiime2/label/r2019.10 diff --git a/nextflow.config b/nextflow.config index 002585af..095b861d 100644 --- a/nextflow.config +++ b/nextflow.config @@ -66,7 +66,7 @@ includeConfig 'conf/base.config' // Container slug. Stable releases should specify release tag! // Developmental code should specify :dev -process.container = 'nfcore/ampliseq:dev' +process.container = 'nfcore/ampliseq:1.1.1' // Load base.config by default for all pipelines includeConfig 'conf/base.config' @@ -125,7 +125,7 @@ manifest { homePage = 'https://github.com/nf-core/ampliseq' description = '16S rRNA amplicon sequencing analysis workflow using QIIME2' homePage = 'https://github.com/nf-core/ampliseq' - version = 'dev' + version = '1.1.1' mainScript = 'main.nf' nextflowVersion = '>=19.10.0' }