diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5542ff958efe0d5f486ebe41f6e8f835e3f8ad6b..30b1986eb9a107283e09326d2d0dca51cbad575e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,8 +58,6 @@ single_end_single_control: single_end_diff: stage: multiple only: - - branches - except: - master script: - NXF_OPTS="-Dleveldb.mmap=false" nextflow run workflow/main.nf --designFile "$CI_PROJECT_DIR/test_data/design_diff_SE.txt" --genome 'GRCm38' --astrocyte false @@ -68,6 +66,8 @@ single_end_diff: paired_end_diff: only: + - branches + except: - master stage: multiple script: diff --git a/workflow/tests/test_diff_peaks.py b/workflow/tests/test_diff_peaks.py index 47940c0b2c103fda1445043915a70b3c4e1464d0..9e35c32c74010edfba2aa7e88f87fee63546354c 100644 --- a/workflow/tests/test_diff_peaks.py +++ b/workflow/tests/test_diff_peaks.py @@ -71,4 +71,4 @@ def test_diffbind_pairedend_single_rep(): assert os.path.exists(os.path.join(test_output_path, 'ENCSR729LGA_vs_ENCSR757EMK_diffbind.bed')) diffbind_file = test_output_path + 'ENCSR729LGA_vs_ENCSR757EMK_diffbind.csv' assert os.path.exists(diffbind_file) - assert utils.count_lines(diffbind_file) >= 65182 + assert utils.count_lines(diffbind_file) >= 65124