Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump version to 1.2.0dev #92

Merged
merged 2 commits into from
Jun 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Expand Up @@ -37,13 +37,13 @@ jobs:

- name: Build new docker image
if: env.MATCHED_FILES
run: docker build --no-cache . -t nfcore/smrnaseq:1.1.0
run: docker build --no-cache . -t nfcore/smrnaseq:dev

- name: Pull docker image
if: ${{ !env.MATCHED_FILES }}
run: |
docker pull nfcore/smrnaseq:dev
docker tag nfcore/smrnaseq:dev nfcore/smrnaseq:1.1.0
docker tag nfcore/smrnaseq:dev nfcore/smrnaseq:dev

- name: Install Nextflow
env:
Expand All @@ -55,4 +55,4 @@ jobs:
- name: Run pipeline with test data
# TODO: Add more run variants with different pipeline flags?
run: |
nextflow run ${GITHUB_WORKSPACE} -profile test,docker
nextflow run ${GITHUB_WORKSPACE} -profile test,docker
6 changes: 6 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,11 @@
# nf-core/smrnaseq: Changelog

## [v1.2.0dev](https://github.com/nf-core/smrnaseq/releases/tag/1.2.0)

### Added

### Packaged software updates

## [v1.1.0](https://github.com/nf-core/smrnaseq/releases/tag/1.1.0) - 2021-06-15

### Major changes
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Expand Up @@ -10,7 +10,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-smrnaseq-1.1.0/bin:$PATH
ENV PATH /opt/conda/envs/nf-core-smrnaseq-1.2.0dev/bin:$PATH

# Dump the details of the installed packages to a file for posterity
RUN conda env export --name nf-core-smrnaseq-1.1.0 > nf-core-smrnaseq-1.1.0.yml
RUN conda env export --name nf-core-smrnaseq-1.2.0dev > nf-core-smrnaseq-1.2.0dev.yml
4 changes: 2 additions & 2 deletions 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-smrnaseq-1.1.0
name: nf-core-smrnaseq-1.2.0dev
channels:
- conda-forge
- bioconda
Expand Down Expand Up @@ -32,4 +32,4 @@ dependencies:
- bioconda::mirtrace=1.0.1
- bioconda::bioconductor-edger=3.26.5
- bioconda::bioconductor-limma=3.40.2
- bioconda::mirdeep2=2.0.1.2
- bioconda::mirdeep2=2.0.1.2
6 changes: 3 additions & 3 deletions nextflow.config
Expand Up @@ -68,7 +68,7 @@ params {

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

// Load base.config by default for all pipelines
includeConfig 'conf/base.config'
Expand Down Expand Up @@ -175,7 +175,7 @@ manifest {
description = 'Small RNA-Seq Best Practice Analysis Pipeline.'
mainScript = 'main.nf'
nextflowVersion = '>=20.04.0'
version = '1.1.0'
version = '1.2.0dev'
}

// Function to ensure that resource requirements don't go beyond
Expand Down Expand Up @@ -209,4 +209,4 @@ def check_max(obj, type) {
return obj
}
}
}
}