Skip to content

Commit 111ea43

Browse files
committed
Template update for nf-core/tools version 3.0.2
1 parent 495e05c commit 111ea43

File tree

14 files changed

+91
-63
lines changed

14 files changed

+91
-63
lines changed

.github/workflows/ci.yml

Lines changed: 43 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,16 @@ on:
1111

1212
env:
1313
NXF_ANSI_LOG: false
14+
NXF_SINGULARITY_CACHEDIR: ${{ github.workspace }}/.singularity
15+
NXF_SINGULARITY_LIBRARYDIR: ${{ github.workspace }}/.singularity
1416

1517
concurrency:
1618
group: "${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}"
1719
cancel-in-progress: true
1820

1921
jobs:
2022
test:
21-
name: Run pipeline with test data
23+
name: "Run pipeline with test data (${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }})"
2224
# Only run on push if this is the nf-core dev branch (merged PRs)
2325
if: "${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/chipseq') }}"
2426
runs-on: ubuntu-latest
@@ -27,33 +29,57 @@ jobs:
2729
NXF_VER:
2830
- "24.04.2"
2931
- "latest-everything"
32+
profile:
33+
- "conda"
34+
- "docker"
35+
- "singularity"
36+
test_name:
37+
- "test"
38+
isMaster:
39+
- ${{ github.base_ref == 'master' }}
40+
# Exclude conda and singularity on dev
41+
exclude:
42+
- isMaster: false
43+
profile: "conda"
44+
- isMaster: false
45+
profile: "singularity"
3046
steps:
3147
- name: Check out pipeline code
3248
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
3349

34-
- name: Install Nextflow
50+
- name: Set up Nextflow
3551
uses: nf-core/setup-nextflow@v2
3652
with:
3753
version: "${{ matrix.NXF_VER }}"
3854

39-
- name: Disk space cleanup
40-
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
55+
- name: Set up Apptainer
56+
if: matrix.profile == 'singularity'
57+
uses: eWaterCycle/setup-apptainer@main
4158

42-
- name: Run pipeline with test data (docker)
43-
# TODO nf-core: You can customise CI pipeline run tests as required
44-
# For example: adding multiple test runs with different parameters
45-
# Remember that you can parallelise this by using strategy.matrix
59+
- name: Set up Singularity
60+
if: matrix.profile == 'singularity'
4661
run: |
47-
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --outdir ./results
62+
mkdir -p $NXF_SINGULARITY_CACHEDIR
63+
mkdir -p $NXF_SINGULARITY_LIBRARYDIR
64+
65+
- name: Set up Miniconda
66+
if: matrix.profile == 'conda'
67+
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3
68+
with:
69+
miniconda-version: "latest"
70+
auto-update-conda: true
71+
conda-solver: libmamba
72+
channels: conda-forge,bioconda
4873

49-
- name: Run pipeline with test data (singularity)
50-
# TODO nf-core: You can customise CI pipeline run tests as required
74+
- name: Set up Conda
75+
if: matrix.profile == 'conda'
5176
run: |
52-
nextflow run ${GITHUB_WORKSPACE} -profile test,singularity --outdir ./results
53-
if: "${{ github.base_ref == 'master' }}"
77+
echo $(realpath $CONDA)/condabin >> $GITHUB_PATH
78+
echo $(realpath python) >> $GITHUB_PATH
79+
80+
- name: Clean up Disk space
81+
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
5482

55-
- name: Run pipeline with test data (conda)
56-
# TODO nf-core: You can customise CI pipeline run tests as required
83+
- name: "Run pipeline with test data ${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }}"
5784
run: |
58-
nextflow run ${GITHUB_WORKSPACE} -profile test,conda --outdir ./results
59-
if: "${{ github.base_ref == 'master' }}"
85+
nextflow run ${GITHUB_WORKSPACE} -profile ${{ matrix.test_name }},${{ matrix.profile }} --outdir ./results

.github/workflows/template_version_comment.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ jobs:
1010
steps:
1111
- name: Check out pipeline code
1212
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
13+
with:
14+
ref: ${{ github.event.pull_request.head.sha }}
1315

1416
- name: Read template version from .nf-core.yml
15-
uses: pietrobolcato/action-read-yaml@1.0.0
17+
uses: nichmor/minimal-read-yaml@v0.0.2
1618
id: read_yml
1719
with:
1820
config: ${{ github.workspace }}/.nf-core.yml
@@ -24,20 +26,21 @@ jobs:
2426
2527
- name: Check nf-core outdated
2628
id: nf_core_outdated
27-
run: pip list --outdated | grep nf-core
29+
run: echo "OUTPUT=$(pip list --outdated | grep nf-core)" >> ${GITHUB_ENV}
2830

2931
- name: Post nf-core template version comment
3032
uses: mshick/add-pr-comment@b8f338c590a895d50bcbfa6c5859251edc8952fc # v2
3133
if: |
32-
${{ steps.nf_core_outdated.outputs.stdout }} =~ 'nf-core'
34+
contains(env.OUTPUT, 'nf-core')
3335
with:
3436
repo-token: ${{ secrets.NF_CORE_BOT_AUTH_TOKEN }}
3537
allow-repeats: false
3638
message: |
37-
## :warning: Newer version of the nf-core template is available.
38-
39-
Your pipeline is using an old version of the nf-core template: ${{ steps.read_yml.outputs['nf_core_version'] }}.
40-
Please update your pipeline to the latest version.
41-
42-
For more documentation on how to update your pipeline, please see the [nf-core documentation](https://github.com/nf-core/tools?tab=readme-ov-file#sync-a-pipeline-with-the-template) and [Synchronisation documentation](https://nf-co.re/docs/contributing/sync).
39+
> [!WARNING]
40+
> Newer version of the nf-core template is available.
41+
>
42+
> Your pipeline is using an old version of the nf-core template: ${{ steps.read_yml.outputs['nf_core_version'] }}.
43+
> Please update your pipeline to the latest version.
44+
>
45+
> For more documentation on how to update your pipeline, please see the [nf-core documentation](https://github.com/nf-core/tools?tab=readme-ov-file#sync-a-pipeline-with-the-template) and [Synchronisation documentation](https://nf-co.re/docs/contributing/sync).
4346
#

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ results/
66
testing/
77
testing*
88
*.pyc
9+
null/

.nf-core.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ lint:
44
- config_defaults:
55
- params.bamtools_filter_se_config
66
- params.bamtools_filter_pe_config
7-
nf_core_version: 3.0.1
7+
nf_core_version: 3.0.2
88
org_path: null
99
repository_type: pipeline
1010
template:
@@ -16,5 +16,5 @@ template:
1616
org: nf-core
1717
outdir: .
1818
skip_features: null
19-
version: 2.1.0
19+
version: 2.2.0dev
2020
update: null

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
44
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
55

6-
## v2.1.0 - [date]
6+
## v2.2.0dev - [date]
77

88
Initial release of nf-core/chipseq, created with the [nf-core](https://nf-co.re/) template.
99

assets/multiqc_config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
report_comment: >
2-
This report has been generated by the <a href="https://github.com/nf-core/chipseq/releases/tag/2.1.0" target="_blank">nf-core/chipseq</a>
2+
This report has been generated by the <a href="https://github.com/nf-core/chipseq/tree/dev" target="_blank">nf-core/chipseq</a>
33
analysis pipeline. For information about how to interpret these results, please see the
4-
<a href="https://nf-co.re/chipseq/2.1.0/docs/output" target="_blank">documentation</a>.
4+
<a href="https://nf-co.re/chipseq/dev/docs/output" target="_blank">documentation</a>.
55
report_section_order:
66
"nf-core-chipseq-methods-description":
77
order: -1000

main.nf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ workflow {
7676
params.outdir,
7777
params.input
7878
)
79-
79+
8080
//
8181
// WORKFLOW: Run main workflow
8282
//

modules.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"multiqc": {
1414
"branch": "master",
15-
"git_sha": "b8d36829fa84b6e404364abff787e8b07f6d058c",
15+
"git_sha": "cf17ca47590cc578dfb47db1c2a44ef86f89976d",
1616
"installed_by": ["modules"]
1717
}
1818
}
@@ -21,12 +21,12 @@
2121
"nf-core": {
2222
"utils_nextflow_pipeline": {
2323
"branch": "master",
24-
"git_sha": "9d05360da397692321d377b6102d2fb22507c6ef",
24+
"git_sha": "3aa0aec1d52d492fe241919f0c6100ebf0074082",
2525
"installed_by": ["subworkflows"]
2626
},
2727
"utils_nfcore_pipeline": {
2828
"branch": "master",
29-
"git_sha": "772684d9d66f37b650c8ba5146ac1ee3ecba2acb",
29+
"git_sha": "1b6b9a3338d011367137808b49b923515080e3ba",
3030
"installed_by": ["subworkflows"]
3131
},
3232
"utils_nfschema_plugin": {

modules/nf-core/multiqc/main.nf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nextflow.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ manifest {
226226
description = """ChIP-seq peak-calling and differential analysis pipeline."""
227227
mainScript = 'main.nf'
228228
nextflowVersion = '!>=24.04.2'
229-
version = '2.1.0'
229+
version = '2.2.0dev'
230230
doi = ''
231231
}
232232

@@ -254,10 +254,10 @@ validation {
254254
"""
255255
afterText = """${manifest.doi ? "* The pipeline\n" : ""}${manifest.doi.tokenize(",").collect { " https://doi.org/${it.trim().replace('https://doi.org/','')}"}.join("\n")}${manifest.doi ? "\n" : ""}
256256
* The nf-core framework
257-
https://doi.org/10.1038/s41587-020-0439-x
257+
https://doi.org/10.1038/s41587-020-0439-x
258258
259259
* Software dependencies
260-
https://github.com/${manifest.name}/blob/master/CITATIONS.md
260+
https://github.com/${manifest.name}/blob/master/CITATIONS.md
261261
"""
262262
}
263263
summary {

0 commit comments

Comments
 (0)