Bump patch version and update changlog

IanKouzel · Apr 29, 2022 · 0d893dd · 0d893dd
1 parent 3d1dad0
commit 0d893dd
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,13 +35,13 @@ jobs:
 
       - name: Build new docker image
         if: env.GIT_DIFF
-        run: docker build --no-cache . -t nfcore/atacseq:1.2.1
+        run: docker build --no-cache . -t nfcore/atacseq:1.2.2
 
       - name: Pull docker image
         if: ${{ !env.GIT_DIFF }}
         run: |
           docker pull nfcore/atacseq:dev
-          docker tag nfcore/atacseq:dev nfcore/atacseq:1.2.1
+          docker tag nfcore/atacseq:dev nfcore/atacseq:1.2.2
 
       - name: Install Nextflow
         run: |
@@ -75,13 +75,13 @@ jobs:
 
       - name: Build new docker image
         if: env.GIT_DIFF
-        run: docker build --no-cache . -t nfcore/atacseq:1.2.1
+        run: docker build --no-cache . -t nfcore/atacseq:1.2.2
 
       - name: Pull docker image
         if: ${{ !env.GIT_DIFF }}
         run: |
           docker pull nfcore/atacseq:dev
-          docker tag nfcore/atacseq:dev nfcore/atacseq:1.2.1
+          docker tag nfcore/atacseq:dev nfcore/atacseq:1.2.2
 
       - name: Install Nextflow
         run: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,15 @@
 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).
 
+## [1.2.2] - 2022-04-29
+
+* Minor patch release to fix Conda environment
+
+### `Dependencies`
+
+* Update r-base `3.6.2` -> `3.6.3`
+* Update r-xfun `0.15`  -> `0.20`
+
 ## [1.2.1] - 2020-07-29
 
 * [#118](https://github.com/nf-core/atacseq/issues/118) - Minor patch release to update pipeline schema

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

diff --git a/nextflow.config b/nextflow.config
@@ -99,7 +99,7 @@ params {
 
 // Container slug. Stable releases should specify release tag!
 // Developmental code should specify :dev
-process.container = 'nfcore/atacseq:1.2.1'
+process.container = 'nfcore/atacseq:1.2.2'
 
 // Load base.config by default for all pipelines
 includeConfig 'conf/base.config'