Merge pull request #740 from jfy133/ver-bump

post release version bump
nf-core · May 6, 2021 · 4500aae · 4500aae
2 parents 13c2f41 + 0b5c780
commit 4500aae
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,13 +34,13 @@ jobs:
 
       - name: Build new docker image
         if: env.MATCHED_FILES
-        run: docker build --no-cache . -t nfcore/eager:2.3.4
+        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.3.4
+          docker tag nfcore/eager:dev nfcore/eager:dev
 
       - name: Install Nextflow
         env:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,16 @@
 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).
 
+## dev - [unreleased]
+
+### `Added`
+
+### `Fixed`
+
+### `Dependencies`
+
+### `Deprecated`
+
 ## v2.3.4 - 2021-05-05
 
 ### `Added`

diff --git 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-eager-2.3.4/bin:$PATH
+ENV PATH /opt/conda/envs/nf-core-eager-2.3.5dev/bin:$PATH
 
 # Dump the details of the installed packages to a file for posterity
-RUN conda env export --name nf-core-eager-2.3.4 > nf-core-eager-2.3.4.yml
+RUN conda env export --name nf-core-eager-2.3.5dev > nf-core-eager-2.3.5dev.yml
 
 # Instruct R processes to use these empty files instead of clashing with a local version
 RUN touch .Rprofile

diff --git 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.3.4
+name: nf-core-eager-2.3.5dev
 channels:
   - conda-forge
   - bioconda

diff --git a/nextflow.config b/nextflow.config
@@ -264,7 +264,7 @@ params {
 
 // Container slug. Stable releases should specify release tag!
 // Developmental code should specify :dev
-process.container = 'nfcore/eager:2.3.4'
+process.container = 'nfcore/eager:dev'
 
 // Load base.config by default for all pipelines
 includeConfig 'conf/base.config'
@@ -393,7 +393,7 @@ manifest {
   description = 'A fully reproducible and state-of-the-art ancient DNA analysis pipeline'
   mainScript = 'main.nf'
   nextflowVersion = '!>=20.07.1'
-  version = '2.3.4'
+  version = '2.3.5dev'
 }
 
 // Function to ensure that resource requirements don't go beyond