From d975962b7651818f16648fdeeb8ed8fb1d27877d Mon Sep 17 00:00:00 2001
From: Paolo Di Tommaso <paolo.ditommaso@gmail.com>
Date: Mon, 5 Aug 2024 22:24:53 +0200
Subject: [PATCH] Fix integration tests

Signed-off-by: Paolo Di Tommaso <paolo.ditommaso@gmail.com>
---
 .github/workflows/build.yml | 2 +-
 packing.gradle              | 4 ++--
 test-ci.sh                  | 1 -
 validation/test.sh          | 8 --------
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e64a7881c0..d6038ff951 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -143,7 +143,7 @@ jobs:
       - name: Run tests
         run: |
           cat $HOME/.nextflow/scm
-          make assemble install
+          make clean assemble install
           bash test-ci.sh
         env:
           TEST_JDK: ${{ matrix.java_version }}
diff --git a/packing.gradle b/packing.gradle
index f2f29a53b5..adc52de1c3 100644
--- a/packing.gradle
+++ b/packing.gradle
@@ -90,7 +90,7 @@ protected coordinates( it ) {
 /*
  * Compile and pack all packages
  */
-task packOne( dependsOn: [clean, compile, ":nextflow:shadowJar"]) {
+task packOne( dependsOn: [compile, ":nextflow:shadowJar"]) {
     doLast {
         def source = "modules/nextflow/build/libs/nextflow-${version}-one.jar"
         ant.copy(file: source, todir: releaseDir, overwrite: true)
@@ -99,7 +99,7 @@ task packOne( dependsOn: [clean, compile, ":nextflow:shadowJar"]) {
     }
 }
 
-task packDist( dependsOn: [clean, compile, ":nextflow:shadowJar"]) {
+task packDist( dependsOn: [compile, ":nextflow:shadowJar"]) {
 
     doLast {
         file(releaseDir).mkdirs()
diff --git a/test-ci.sh b/test-ci.sh
index 2d3b119e14..41c008b53e 100755
--- a/test-ci.sh
+++ b/test-ci.sh
@@ -16,7 +16,6 @@ fi
 export WITH_DOCKER='-with-docker'
 export NXF_PLUGINS_DIR=$PWD/build/plugins
 export NXF_CMD=$PWD/nextflow;
-export CAPSULE_LOG=none
 export TEST_JDK
 export TEST_MODE
 
diff --git a/validation/test.sh b/validation/test.sh
index fd21db094a..3ca483728c 100755
--- a/validation/test.sh
+++ b/validation/test.sh
@@ -46,14 +46,6 @@ if [[ $TEST_MODE == 'test_integration' ]]; then
     $NXF_CMD run nextflow-io/rnaseq-nf -with-docker $OPTS
     $NXF_CMD run nextflow-io/rnaseq-nf -with-docker $OPTS -resume
 
-    #
-    # RNASEQ-NF with async finalizer
-    #
-    echo nextflow-io/rnaseq-nf async finalizer
-    [[ $TOWER_ACCESS_TOKEN ]] && OPTS='-with-tower' || OPTS=''
-    NXF_ENABLE_ASYNC_FINALIZER=true $NXF_CMD run nextflow-io/rnaseq-nf -with-docker
-    NXF_ENABLE_ASYNC_FINALIZER=true $NXF_CMD run nextflow-io/rnaseq-nf -with-docker -resume
-
     exit 0
 fi