diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a8a8ba508df126c0af56f37daa5fe7e94a976875..896e2aee13aff5506249910ead3deb2fb339b645 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,13 +34,13 @@ jobs: - name: Build new docker image if: env.GIT_DIFF - run: docker build --no-cache . -t nfcore/hic:1.2.2 + run: docker build --no-cache . -t nfcore/hic:dev - name: Pull docker image if: ${{ !env.GIT_DIFF }} run: | docker pull nfcore/hic:dev - docker tag nfcore/hic:dev nfcore/hic:1.2.2 + docker tag nfcore/hic:dev nfcore/hic:dev - name: Install Nextflow run: | diff --git a/CHANGELOG.md b/CHANGELOG.md index 201b5c94015b12cbcc1c7b4198246dbf7e49cb31..91e28401a534e78bc561b53df1762fcc7b7c4242 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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.3dev +## v1.3dev * Template update for nf-core/tools v1.11 diff --git a/Dockerfile b/Dockerfile index 70ba2d7b13acc7835c8d4bfd3ba0022b336350e9..ea66370a7577c7870fd4cdf1013e40d29a5d867b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,10 +9,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-hic-1.2.2/bin:$PATH +ENV PATH /opt/conda/envs/nf-core-hic-1.3dev/bin:$PATH # Dump the details of the installed packages to a file for posterity -RUN conda env export --name nf-core-hic-1.2.2 > nf-core-hic-1.2.2.yml +RUN conda env export --name nf-core-hic-1.3dev > nf-core-hic-1.3dev.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 index ccca9c3d12e94380287c1be0f9f34ca9813890ae..2caba8e666c012485556b6c8db2da5b8c2c7b9a7 100644 --- 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-hic-1.2.2 +name: nf-core-hic-1.3dev channels: - conda-forge - bioconda diff --git a/nextflow.config b/nextflow.config index 341e2a52fda6ba43db1a497be24b7d6643be6c7b..2cc0c226b80b5a06a810124c0a849768e949385a 100644 --- a/nextflow.config +++ b/nextflow.config @@ -80,7 +80,7 @@ params { // Container slug. Stable releases should specify release tag! // Developmental code should specify :dev -process.container = 'nfcore/hic:1.2.2' +process.container = 'nfcore/hic:dev' // Load base.config by default for all pipelines includeConfig 'conf/base.config' @@ -153,7 +153,7 @@ manifest { description = 'Analysis of Chromosome Conformation Capture data (Hi-C)' mainScript = 'main.nf' nextflowVersion = '>=19.10.0' - version = '1.2.2' + version = '1.3dev' } // Function to ensure that resource requirements don't go beyond