Skip to content

Commit

Permalink
Merge pull request #1857 from ewels/bugfix-include-base-cong
Browse files Browse the repository at this point in the history
Don't skip `base.config` when skipping nf-core/configs
  • Loading branch information
ewels authored Oct 3, 2022
2 parents c2c4f54 + 1182951 commit aca662e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
- Add a 'recommend' methods description text to MultiQC to help pipeline users report pipeline usage in publications ([#1749](https://github.com/nf-core/tools/pull/1749))
- Fix template spacing modified by JINJA ([#1830](https://github.com/nf-core/tools/pull/1830))
- Fix MultiQC execution on template [#1855](https://github.com/nf-core/tools/pull/1855)
- Don't skip including `base.config` when skipping nf-core/configs

### Linting

Expand Down
6 changes: 3 additions & 3 deletions nf_core/pipeline-template/nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,11 @@ params {
max_time = '240.h'

}
{% if nf_core_configs %}

// Load base.config by default for all pipelines
includeConfig 'conf/base.config'

{% if nf_core_configs -%}
// Load nf-core custom profiles from different Institutions
try {
includeConfig "${params.custom_config_base}/nfcore_custom.config"
Expand All @@ -77,9 +78,8 @@ try {
// } catch (Exception e) {
// System.err.println("WARNING: Could not load nf-core/config/{{ short_name }} profiles: ${params.custom_config_base}/pipeline/{{ short_name }}.config")
// }


{% endif %}

profiles {
debug { process.beforeScript = 'echo $HOSTNAME' }
conda {
Expand Down

0 comments on commit aca662e

Please sign in to comment.