Skip to content
Snippets Groups Projects
Commit 069f5edc authored by nf-core-bot's avatar nf-core-bot
Browse files

Template update for nf-core/tools version 1.10.2

parent 953bb961
No related branches found
No related tags found
No related merge requests found
...@@ -46,7 +46,7 @@ These tests are run both with the latest available version of `Nextflow` and als ...@@ -46,7 +46,7 @@ These tests are run both with the latest available version of `Nextflow` and als
## Patch ## Patch
: warning: Only in the unlikely and regretful event of a release happening with a bug. :warning: Only in the unlikely and regretful event of a release happening with a bug.
* On your own fork, make a new branch `patch` based on `upstream/master`. * On your own fork, make a new branch `patch` based on `upstream/master`.
* Fix the bug, and bump version (X.Y.Z+1). * Fix the bug, and bump version (X.Y.Z+1).
......
...@@ -21,7 +21,7 @@ jobs: ...@@ -21,7 +21,7 @@ jobs:
run: conda install -c conda-forge awscli run: conda install -c conda-forge awscli
- name: Start AWS batch job - name: Start AWS batch job
# TODO nf-core: You can customise AWS full pipeline tests as required # TODO nf-core: You can customise AWS full pipeline tests as required
# Add full size test data (but still relatively small datasets for few samples) # Add full size test data (but still relatively small datasets for few samples)
# on the `test_full.config` test runs with only one set of parameters # on the `test_full.config` test runs with only one set of parameters
# Then specify `-profile test_full` instead of `-profile test` on the AWS batch command # Then specify `-profile test_full` instead of `-profile test` on the AWS batch command
env: env:
......
...@@ -17,6 +17,7 @@ jobs: ...@@ -17,6 +17,7 @@ jobs:
# If the above check failed, post a comment on the PR explaining the failure # If the above check failed, post a comment on the PR explaining the failure
# NOTE - this doesn't currently work if the PR is coming from a fork, due to limitations in GitHub actions secrets
- name: Post PR comment - name: Post PR comment
if: failure() if: failure()
uses: mshick/add-pr-comment@v1 uses: mshick/add-pr-comment@v1
......
...@@ -57,5 +57,12 @@ jobs: ...@@ -57,5 +57,12 @@ jobs:
GITHUB_COMMENTS_URL: ${{ github.event.pull_request.comments_url }} GITHUB_COMMENTS_URL: ${{ github.event.pull_request.comments_url }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_PR_COMMIT: ${{ github.event.pull_request.head.sha }} GITHUB_PR_COMMIT: ${{ github.event.pull_request.head.sha }}
run: nf-core lint ${GITHUB_WORKSPACE} run: nf-core -l lint_log.txt lint ${GITHUB_WORKSPACE}
- name: Upload linting log file artifact
if: ${{ always() }}
uses: actions/upload-artifact@v2
with:
name: linting-log-file
path: lint_log.txt
...@@ -8,32 +8,33 @@ on: ...@@ -8,32 +8,33 @@ on:
release: release:
types: [published] types: [published]
push_dockerhub: jobs:
name: Push new Docker image to Docker Hub push_dockerhub:
runs-on: ubuntu-latest name: Push new Docker image to Docker Hub
# Only run for the nf-core repo, for releases and merged PRs runs-on: ubuntu-latest
if: ${{ github.repository == 'nf-core/hic' }} # Only run for the nf-core repo, for releases and merged PRs
env: if: ${{ github.repository == 'nf-core/hic' }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} env:
DOCKERHUB_PASS: ${{ secrets.DOCKERHUB_PASS }} DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
steps: DOCKERHUB_PASS: ${{ secrets.DOCKERHUB_PASS }}
- name: Check out pipeline code steps:
uses: actions/checkout@v2 - name: Check out pipeline code
uses: actions/checkout@v2
- name: Build new docker image - name: Build new docker image
run: docker build --no-cache . -t nfcore/hic:latest run: docker build --no-cache . -t nfcore/hic:latest
- name: Push Docker image to DockerHub (dev) - name: Push Docker image to DockerHub (dev)
if: ${{ github.event_name == 'push' }} if: ${{ github.event_name == 'push' }}
run: | run: |
echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
docker tag nfcore/hic:latest nfcore/hic:dev docker tag nfcore/hic:latest nfcore/hic:dev
docker push nfcore/hic:dev docker push nfcore/hic:dev
- name: Push Docker image to DockerHub (release) - name: Push Docker image to DockerHub (release)
if: ${{ github.event_name == 'release' }} if: ${{ github.event_name == 'release' }}
run: | run: |
echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
docker push nfcore/hic:latest docker push nfcore/hic:latest
docker tag nfcore/hic:latest nfcore/hic:${{ github.event.release.tag_name }} docker tag nfcore/hic:latest nfcore/hic:${{ github.event.release.tag_name }}
docker push nfcore/hic:${{ github.event.release.tag_name }} docker push nfcore/hic:${{ github.event.release.tag_name }}
FROM nfcore/base:1.10.1 FROM nfcore/base:1.10.2
LABEL authors="Nicolas Servant" \ LABEL authors="Nicolas Servant" \
description="Docker image containing all software requirements for the nf-core/hic pipeline" description="Docker image containing all software requirements for the nf-core/hic pipeline"
......
...@@ -15,7 +15,7 @@ params { ...@@ -15,7 +15,7 @@ params {
// TODO nf-core: Specify the paths to your full test data ( on nf-core/test-datasets or directly in repositories, e.g. SRA) // TODO nf-core: Specify the paths to your full test data ( on nf-core/test-datasets or directly in repositories, e.g. SRA)
// TODO nf-core: Give any required params for the test so that command line flags are not needed // TODO nf-core: Give any required params for the test so that command line flags are not needed
single_end = false single_end = false
readPaths = [ input_paths = [
['Testdata', ['https://github.com/nf-core/test-datasets/raw/exoseq/testdata/Testdata_R1.tiny.fastq.gz', 'https://github.com/nf-core/test-datasets/raw/exoseq/testdata/Testdata_R2.tiny.fastq.gz']], ['Testdata', ['https://github.com/nf-core/test-datasets/raw/exoseq/testdata/Testdata_R1.tiny.fastq.gz', 'https://github.com/nf-core/test-datasets/raw/exoseq/testdata/Testdata_R2.tiny.fastq.gz']],
['SRR389222', ['https://github.com/nf-core/test-datasets/raw/methylseq/testdata/SRR389222_sub1.fastq.gz', 'https://github.com/nf-core/test-datasets/raw/methylseq/testdata/SRR389222_sub2.fastq.gz']] ['SRR389222', ['https://github.com/nf-core/test-datasets/raw/methylseq/testdata/SRR389222_sub1.fastq.gz', 'https://github.com/nf-core/test-datasets/raw/methylseq/testdata/SRR389222_sub2.fastq.gz']]
] ]
......
...@@ -80,7 +80,7 @@ You can also supply a run name to resume a specific run: `-resume [run-name]`. U ...@@ -80,7 +80,7 @@ You can also supply a run name to resume a specific run: `-resume [run-name]`. U
### `-c` ### `-c`
Specify the path to a specific config file (this is a core NextFlow command). See the [nf-core website documentation](https://nf-co.re/usage/configuration) for more information. Specify the path to a specific config file (this is a core Nextflow command). See the [nf-core website documentation](https://nf-co.re/usage/configuration) for more information.
#### Custom resource requests #### Custom resource requests
......
...@@ -127,7 +127,7 @@ def summary = [:] ...@@ -127,7 +127,7 @@ def summary = [:]
if (workflow.revision) summary['Pipeline Release'] = workflow.revision if (workflow.revision) summary['Pipeline Release'] = workflow.revision
summary['Run Name'] = custom_runName ?: workflow.runName summary['Run Name'] = custom_runName ?: workflow.runName
// TODO nf-core: Report custom parameters here // TODO nf-core: Report custom parameters here
summary['Reads'] = params.input summary['Input'] = params.input
summary['Fasta Ref'] = params.fasta summary['Fasta Ref'] = params.fasta
summary['Data Type'] = params.single_end ? 'Single-End' : 'Paired-End' summary['Data Type'] = params.single_end ? 'Single-End' : 'Paired-End'
summary['Max Resources'] = "$params.max_memory memory, $params.max_cpus cpus, $params.max_time time per job" summary['Max Resources'] = "$params.max_memory memory, $params.max_cpus cpus, $params.max_time time per job"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment