From 773b3b18afb6c4341f8e9b4059e22b1f31f6d123 Mon Sep 17 00:00:00 2001 From: Johan Dahlberg Date: Thu, 30 Apr 2026 09:52:22 +0200 Subject: [PATCH] Trying to fix sort order for combine-collapse --- .../single-cell-pna/combine_collapse/tests/main.nf.test | 1 + subworkflows/local/pna/main.nf | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/local/pixelator/single-cell-pna/combine_collapse/tests/main.nf.test b/modules/local/pixelator/single-cell-pna/combine_collapse/tests/main.nf.test index 00220c34..9b55acf1 100644 --- a/modules/local/pixelator/single-cell-pna/combine_collapse/tests/main.nf.test +++ b/modules/local/pixelator/single-cell-pna/combine_collapse/tests/main.nf.test @@ -11,6 +11,7 @@ nextflow_process { test("PNA combine collapse - stub") { + tag "stub" options "-stub" diff --git a/subworkflows/local/pna/main.nf b/subworkflows/local/pna/main.nf index 90b37813..d6e573af 100644 --- a/subworkflows/local/pna/main.nf +++ b/subworkflows/local/pna/main.nf @@ -104,9 +104,9 @@ workflow PNA { def newMeta = data[0][0].clone() newMeta.remove('parts') - // Strip the duplicates meta from each element - def parquet = data.collect { _meta, collapsed, _reports -> collapsed }.flatten() - def reports = data.collect { _meta, _collapsed, reports -> reports }.flatten() + // Strip duplicate meta and keep a stable ordering to avoid cache misses on resume. + def parquet = data.collect { _meta, collapsed, _reports -> collapsed }.flatten().sort { it.toString() } + def reports = data.collect { _meta, _collapsed, reports -> reports }.flatten().sort { it.toString() } [newMeta, parquet, reports] }