Merge branch 'custom-primer-fix' into 'dev'

Custom primer fix See merge request epi2melabs/workflow-containers/wf-artic!106
epi2me-labs · Apr 21, 2022 · 276d172 · 276d172
2 parents fe094ad + 5d4e833
commit 276d172
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 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).
 
+## [v0.3.14]
+### Fixed
+- Issue with custom schemes
+
 ## [v0.3.13]
 ### Changes
 - Updated primer schemes

diff --git a/main.nf b/main.nf
@@ -515,14 +515,13 @@ WorkflowMain.initialise(workflow, params, log)
 
 workflow {
 
+    c_green = params.monochrome_logs ? '' : "\033[0;32m";
+    c_reset = params.monochrome_logs ? '' : "\033[0m";
+    c_yellow = params.monochrome_logs ? '' : "\033[0;33m";
+    c_purple = params.monochrome_logs ? '' : "\033[0;35m";
 
     if (!params.custom_scheme){
 
-      c_green = params.monochrome_logs ? '' : "\033[0;32m";
-      c_reset = params.monochrome_logs ? '' : "\033[0m";
-      c_yellow = params.monochrome_logs ? '' : "\033[0;33m";
-      c_purple = params.monochrome_logs ? '' : "\033[0;35m";
-
       schemes = file(projectDir.resolve("./data/primer_schemes/**bed"), type: 'file', maxdepth: 10)
 
       valid_scheme_versions = []

diff --git a/nextflow.config b/nextflow.config
@@ -33,7 +33,7 @@ params {
     report_coverage = true
     report_variant_summary = true
     report_detailed = false
-    wfversion = "v0.3.13"
+    wfversion = "v0.3.14"
     pangolin_version = "4.0.5"
     nextclade_version = "1.11.0"
     nextclade_data_tag = null

diff --git a/nextflow_schema.json b/nextflow_schema.json
@@ -249,7 +249,7 @@
         },
         "wfversion": {
             "type": "string",
-            "default": "v0.3.13",
+            "default": "v0.3.14",
             "hidden": true
         },
         "_min_len": {