From 3bd0771a9c38c440cea9324e777c40919d786cbe Mon Sep 17 00:00:00 2001 From: Harshil Patel Date: Fri, 26 Jul 2024 10:00:01 +0100 Subject: [PATCH 1/3] fix: check if fusion is enabled via the Platform API --- modules/local/seqera_runs_dump/functions.nf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/local/seqera_runs_dump/functions.nf b/modules/local/seqera_runs_dump/functions.nf index b08db2f..3a71b62 100644 --- a/modules/local/seqera_runs_dump/functions.nf +++ b/modules/local/seqera_runs_dump/functions.nf @@ -2,6 +2,7 @@ import wslite.rest.RESTClient import groovy.json.JsonSlurper import nextflow.exception.ProcessException +import groovy.json.JsonBuilder // Set system properties for custom Java trustStore def setTrustStore(trustStorePath, trustStorePassword) { @@ -49,8 +50,10 @@ Map getRunMetadata(meta, log, api_endpoint, trustStorePath, trustStorePassword) def workflowResponse = client.get(path: "/workflow/${runId}", query: ["workspaceId":workspaceId], headers: authHeader) if (workflowResponse.statusCode == 200) { def metaMap = workflowResponse?.json?.workflow?.subMap("runName", "workDir", "projectName") - def config = new ConfigSlurper().parse( workflowResponse?.json?.workflow?.configText ) - metaMap.fusion = config.fusion.enabled + def configText = new JsonBuilder(workflowResponse?.json?.workflow?.configText) + def pattern = /fusion\s*\{\\n\s*enabled\s*=\s*true/ + def matcher = configText.toPrettyString() =~ pattern + metaMap.fusion = matcher.find() return metaMap ?: [:] } From 40caee1883168253b5ac89ce5810fd605e64a2c2 Mon Sep 17 00:00:00 2001 From: Harshil Patel Date: Fri, 26 Jul 2024 16:38:59 +0100 Subject: [PATCH 2/3] chore: bump pipeline version to 0.4.0 --- nextflow.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextflow.config b/nextflow.config index 5178fbb..c61c3bf 100644 --- a/nextflow.config +++ b/nextflow.config @@ -222,6 +222,6 @@ manifest { mainScript = 'main.nf' nextflowVersion = '!>=23.10.0' defaultBranch = 'main' - version = '0.3.0' + version = '0.4.0' doi = '' } From f1e4b6412c4adf3f02e4916f218abf08d03dbf90 Mon Sep 17 00:00:00 2001 From: Harshil Patel Date: Fri, 26 Jul 2024 16:39:10 +0100 Subject: [PATCH 3/3] chore: update CHANGELOG --- CHANGELOG.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d186c1b..36c915d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,22 @@ 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). +## [[0.4.0](https://github.com/seqeralabs/nf-aggregate/releases/tag/0.4.0)] - 2024-07-26 + +### Credits + +Special thanks to the following for their contributions to the release: + +- [Friederike Hanssen](https://github.com/FriederikeHanssen) + +Thank you to everyone else that has contributed by reporting bugs, enhancements or in any other way, shape or form. + +### Enhancements & fixes + +[PR #52](https://github.com/seqeralabs/nf-aggregate/pull/52) - Organise results folder structure by pipeline +[PR #53](https://github.com/seqeralabs/nf-aggregate/pull/53) - Throw exception and terminate workflow in case config can't be read +[PR #57](https://github.com/seqeralabs/nf-aggregate/pull/57) - Check if fusion is enabled via the Platform API + ## [[0.3.0](https://github.com/seqeralabs/nf-aggregate/releases/tag/0.3.0)] - 2024-07-01 ### Credits