Skip to content

Commit 1dd8ea0

Browse files
authored
Merge pull request #3301 from LouisLeNezet/LouisLeNezet-config
Move modules config import
2 parents 7284262 + aacc24d commit 1dd8ea0

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
- Add resource limits to Gitpod profile([#3255](https://github.com/nf-core/tools/pull/3255))
1212
- Fix a typo ([#3268](https://github.com/nf-core/tools/pull/3268))
1313
- Remove `def` from `nextflow.config` and add `trace_report_suffix` param ([#3296](https://github.com/nf-core/tools/pull/3296))
14+
- Move `includeConfig 'conf/modules.config'` next to `includeConfig 'conf/base.config'` to not overwrite tests profiles configurations ([#3301](https://github.com/nf-core/tools/pull/3301))
1415

1516
### Download
1617

nf_core/pipeline-template/nextflow.config

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,11 @@ params {
7777
includeConfig 'conf/base.config'
7878
{%- else %}
7979

80+
{% if modules -%}
81+
// Load modules.config for DSL2 module specific options
82+
includeConfig 'conf/modules.config'
83+
{%- endif %}
84+
8085
process {
8186
// TODO nf-core: Check the defaults for all processes
8287
cpus = { 1 * task.attempt }
@@ -316,8 +321,3 @@ validation {
316321
}{% endif %}
317322
}
318323
{%- endif %}
319-
320-
{% if modules -%}
321-
// Load modules.config for DSL2 module specific options
322-
includeConfig 'conf/modules.config'
323-
{%- endif %}

0 commit comments

Comments
 (0)