From c808e4b085ccc2b077465044f85deec6cf362cae Mon Sep 17 00:00:00 2001 From: Thiseas Christos Lamnidis Date: Tue, 2 Aug 2022 15:44:41 +0200 Subject: [PATCH] dev version bump --- .github/workflows/ci.yml | 4 ++-- CHANGELOG.md | 12 +++++++++++- Dockerfile | 4 ++-- environment.yml | 2 +- nextflow.config | 4 ++-- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 276f8b6d0..afefa04c9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,13 +37,13 @@ jobs: - name: Build new docker image if: env.MATCHED_FILES - run: docker build --no-cache . -t nfcore/eager:2.4.5 + run: docker build --no-cache . -t nfcore/eager:dev - name: Pull docker image if: ${{ !env.MATCHED_FILES }} run: | docker pull nfcore/eager:dev - docker tag nfcore/eager:dev nfcore/eager:2.4.5 + docker tag nfcore/eager:dev nfcore/eager:dev - name: Install Nextflow env: diff --git a/CHANGELOG.md b/CHANGELOG.md index 04f1f7208..dc744f11e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [2.4.5] - 2022-07-39 +## [dev] + +### `Added` + +### `Fixed` + +### `Dependencies` + +### `Deprecated` + +## [2.4.5] - 2022-08-02 ### `Added` diff --git a/Dockerfile b/Dockerfile index d5bae974c..b14d3177c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ 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-eager-2.4.5/bin:$PATH +ENV PATH /opt/conda/envs/nf-core-eager-2.4.5dev/bin:$PATH # Dump the details of the installed packages to a file for posterity -RUN conda env export --name nf-core-eager-2.4.5 > nf-core-eager-2.4.5.yml \ No newline at end of file +RUN conda env export --name nf-core-eager-2.4.5dev > nf-core-eager-2.4.5dev.yml \ No newline at end of file diff --git a/environment.yml b/environment.yml index 0676e6578..3f3d30f74 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-eager-2.4.5 +name: nf-core-eager-2.4.5dev channels: - conda-forge - bioconda diff --git a/nextflow.config b/nextflow.config index 28ab8c132..81a67d1ba 100644 --- a/nextflow.config +++ b/nextflow.config @@ -284,7 +284,7 @@ params { // Container slug. Stable releases should specify release tag! // Developmental code should specify :dev -process.container = 'nfcore/eager:2.4.5' +process.container = 'nfcore/eager:dev' // Load base.config by default for all pipelines includeConfig 'conf/base.config' @@ -414,7 +414,7 @@ manifest { description = 'A fully reproducible and state-of-the-art ancient DNA analysis pipeline' mainScript = 'main.nf' nextflowVersion = '>=20.07.1' - version = '2.4.5' + version = '2.4.5dev' } // Function to ensure that resource requirements don't go beyond