Skip to content

Commit

Permalink
Bump version 1.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
skrakau committed Nov 10, 2020
1 parent 8619350 commit 9f50616
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 16 deletions.
8 changes: 4 additions & 4 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/mag:dev
run: docker build --no-cache . -t nfcore/mag:1.1.1

- name: Pull docker image
if: ${{ !env.GIT_DIFF }}
run: |
docker pull nfcore/mag:dev
docker tag nfcore/mag:dev nfcore/mag:dev
docker tag nfcore/mag:dev nfcore/mag:1.1.1
- name: Check if BUSCO Dockerfile or Conda environment changed
uses: technote-space/get-diff-action@v1
Expand All @@ -51,13 +51,13 @@ jobs:
- name: Build new docker image for BUSCO
if: env.GIT_DIFF
run: docker build --no-cache ./containers/busco/ -t nfcore/magbusco:dev
run: docker build --no-cache ./containers/busco/ -t nfcore/magbusco:1.1.1

- name: Pull docker image for BUSCO
if: ${{ !env.GIT_DIFF }}
run: |
docker pull nfcore/magbusco:dev
docker tag nfcore/magbusco:dev nfcore/magbusco:dev
docker tag nfcore/magbusco:dev nfcore/magbusco:1.1.1
- name: Install Nextflow
run: |
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## v1.2.0dev - [date]
## v1.1.1 - 2019/11/10

### `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-mag-1.2.0dev/bin:$PATH
ENV PATH /opt/conda/envs/nf-core-mag-1.1.1/bin:$PATH

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

# Instruct R processes to use these empty files instead of clashing with a local version
RUN touch .Rprofile
Expand Down
6 changes: 3 additions & 3 deletions conf/base.config
Original file line number Diff line number Diff line change
Expand Up @@ -106,23 +106,23 @@ process {
time = { check_max (8.h * task.attempt, 'time' ) }
}
withName: busco {
container = 'nfcore/magbusco:dev'
container = 'nfcore/magbusco:1.1.1'
profiles {
conda {
conda = "$baseDir/containers/busco/environment.yml"
}
}
}
withName: busco_plot {
container = 'nfcore/magbusco:dev'
container = 'nfcore/magbusco:1.1.1'
profiles {
conda {
conda = "$baseDir/containers/busco/environment.yml"
}
}
}
withName: get_busco_version {
container = 'nfcore/magbusco:dev'
container = 'nfcore/magbusco:1.1.1'
profiles {
conda {
conda = "$baseDir/containers/busco/environment.yml"
Expand Down
4 changes: 2 additions & 2 deletions containers/busco/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ RUN apt-get update
RUN apt-get install -y libxt6

# Add conda installation dir to PATH (instead of doing 'conda activate')
ENV PATH /opt/conda/envs/nf-core-mag-busco-1.2.0dev/bin:$PATH
ENV PATH /opt/conda/envs/nf-core-mag-busco-1.1.1/bin:$PATH

# Dump the details of the installed packages to a file for posterity
RUN conda env export --name nf-core-mag-busco-1.2.0dev > nf-core-mag-busco-1.2.0dev.yml
RUN conda env export --name nf-core-mag-busco-1.1.1 > nf-core-mag-busco-1.1.1.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 containers/busco/environment.yml
Original file line number Diff line number Diff line change
@@ -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-mag-busco-1.2.0dev
name: nf-core-mag-busco-1.1.1
channels:
- conda-forge
- bioconda
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
@@ -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-mag-1.2.0dev
name: nf-core-mag-1.1.1
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 @@ -94,7 +94,7 @@ params {

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

// Load base.config by default for all pipelines
includeConfig 'conf/base.config'
Expand Down Expand Up @@ -175,7 +175,7 @@ manifest {
description = 'Assembly, binning and annotation of metagenomes'
mainScript = 'main.nf'
nextflowVersion = '>=19.10.0'
version = '1.2.0dev'
version = '1.1.1'
}

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

0 comments on commit 9f50616

Please sign in to comment.