Skip to content

Commit

Permalink
Fix integration tests
Browse files Browse the repository at this point in the history
Signed-off-by: Paolo Di Tommaso <[email protected]>
  • Loading branch information
pditommaso committed Aug 5, 2024
1 parent 5ee88cd commit d975962
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions packing.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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()
Expand Down
1 change: 0 additions & 1 deletion test-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 0 additions & 8 deletions validation/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit d975962

Please sign in to comment.