Skip to content

Commit

Permalink
Dev version bump to 2.3.0dev
Browse files Browse the repository at this point in the history
  • Loading branch information
jfy133 committed Oct 21, 2020
1 parent 0b62ce5 commit 3476908
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ jobs:
- name: Build new docker image
if: env.GIT_DIFF
run: docker build --no-cache . -t nfcore/eager:2.2.0
run: docker build --no-cache . -t nfcore/eager:dev

- name: Pull docker image
if: ${{ !env.GIT_DIFF }}
run: |
docker pull nfcore/eager:dev
docker tag nfcore/eager:dev nfcore/eager:2.2.0
docker tag nfcore/eager:dev nfcore/eager:dev
- name: Install Nextflow
run: |
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
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.3.0dev] - Wangen - Unreleased

### `Added

### `Fixed`

### `Dependencies`

## [2.2.0] - Ulm - 2020-10-20

### `Added`
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.0/bin:$PATH
ENV PATH /opt/conda/envs/nf-core-eager-2.3.0dev/bin:$PATH

# Dump the details of the installed packages to a file for posterity
RUN conda env export --name nf-core-eager-2.2.0 > nf-core-eager-2.2.0.yml
RUN conda env export --name nf-core-eager-2.3.0dev > nf-core-eager-2.3.0dev.yml

# Instruct R processes to use these empty files instead of clashing with a local version
RUN touch .Rprofile
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: nf-core-eager-2.2.0
name: nf-core-eager-2.3.0dev
channels:
- conda-forge
- bioconda
Expand Down
4 changes: 2 additions & 2 deletions nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ params {

// Container slug. Stable releases should specify release tag!
// Developmental code should specify :dev
process.container = 'nfcore/eager:2.2.0'
process.container = 'nfcore/eager:dev'

// Load base.config by default for all pipelines
includeConfig 'conf/base.config'
Expand Down Expand Up @@ -345,7 +345,7 @@ manifest {
description = 'A fully reproducible and state-of-the-art ancient DNA analysis pipeline'
mainScript = 'main.nf'
nextflowVersion = '!>=20.04.0'
version = '2.2.0'
version = '2.3.0dev'
}

// Function to ensure that resource requirements don't go beyond
Expand Down

0 comments on commit 3476908

Please sign in to comment.