diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 03a422fc78ecb76ac0bae7962cda596acec7e15b..29ac9005a4cd9640463a52841aec7e999cf8ac0e 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ before_script: - module load astrocyte - module load python/3.6.1-2-anaconda - pip install --user pytest-pythonpath==0.7.1 pytest-cov==2.5.1 - - module load nextflow/0.31.1_Ignite + - module load nextflow/19.09.0 - mkdir test_data/hu.v3s1r500 - mkdir test_data/mu.v3s1r500 - mkdir test_data/hu.v3s2r10k @@ -40,7 +40,7 @@ simple_1: - develop - master script: - - nextflow run workflow/main.nf --fastq "$CI_PROJECT_DIR/test_data/hu.v3s1r500/*.fastq.gz" --designFile "$CI_PROJECT_DIR/test_data/hu.v3s1r500/design.csv" --genome 'GRCh38-3.0.0' --kitVersion 'three' --version '3.1.0' + - nextflow run workflow/main.nf --fastq "test_data/hu.v3s1r500/*.fastq.gz" --designFile "test_data/hu.v3s1r500/design.csv" --genome 'GRCh38-3.0.0' --kitVersion 'three' --version '3.1.0' -with-tower - pytest -m count310 artifacts: name: "$CI_JOB_NAME" @@ -65,7 +65,7 @@ simple_2: - master - tags script: - - nextflow run workflow/main.nf --fastq "$CI_PROJECT_DIR/test_data/mu.v3s1r500/*.fastq.gz" --designFile "$CI_PROJECT_DIR/test_data/mu.v3s1r500/design.csv" --genome 'mm10-3.0.0' --kitVersion 'three' --version '3.1.0' + - nextflow run workflow/main.nf --fastq "test_data/mu.v3s1r500/*.fastq.gz" --designFile "test_data/mu.v3s1r500/design.csv" --genome 'mm10-3.0.0' --kitVersion 'three' --version '3.1.0' -with-tower - pytest -m count310 artifacts: name: "$CI_JOB_NAME" @@ -89,7 +89,7 @@ detailed_1: refs: - tags script: - - nextflow run workflow/main.nf --fastq "$CI_PROJECT_DIR/test_data/hu.v3s2r10k/*.fastq.gz" --designFile "$CI_PROJECT_DIR/test_data/hu.v3s2r10k/design.csv" --genome 'GRCh38-3.0.0' --kitVersion 'auto' --version '3.1.0' + - nextflow run workflow/main.nf --fastq "test_data/hu.v3s2r10k/*.fastq.gz" --designFile "test_data/hu.v3s2r10k/design.csv" --genome 'GRCh38-3.0.0' --kitVersion 'auto' --version '3.1.0' -with-tower - pytest -m count310 artifacts: name: "$CI_JOB_NAME" @@ -114,7 +114,7 @@ detailed_2: refs: - tags script: - - nextflow run workflow/main.nf --fastq "$CI_PROJECT_DIR/test_data/hu.v3s2r10k/*.fastq.gz" --designFile "$CI_PROJECT_DIR/test_data/hu.v3s2r10k/design.csv" --genome 'GRCh38-3.0.0' --kitVersion 'auto' --version '3.0.2' + - nextflow run workflow/main.nf --fastq "test_data/hu.v3s2r10k/*.fastq.gz" --designFile "test_data/hu.v3s2r10k/design.csv" --genome 'GRCh38-3.0.0' --kitVersion 'auto' --version '3.0.2' -with-tower - pytest -m count302 artifacts: name: "$CI_JOB_NAME" @@ -138,7 +138,7 @@ detailed_3: refs: - tags script: - - nextflow run workflow/main.nf --fastq "$CI_PROJECT_DIR/test_data/mu.v3s2r10k/*.fastq.gz" --designFile "$CI_PROJECT_DIR/test_data/mu.v3s2r10k/design.csv" --genome 'mm10-3.0.0' --kitVersion 'three' --version '3.0.1' + - nextflow run workflow/main.nf --fastq "test_data/mu.v3s2r10k/*.fastq.gz" --designFile "test_data/mu.v3s2r10k/design.csv" --genome 'mm10-3.0.0' --kitVersion 'three' --version '3.0.1' -with-tower - pytest -m count301 artifacts: name: "$CI_JOB_NAME" @@ -162,7 +162,7 @@ detailed_4: refs: - tags script: - - nextflow run workflow/main.nf --fastq "$CI_PROJECT_DIR/test_data/hu.v2s2r10k/*.fastq.gz" --designFile "$CI_PROJECT_DIR/test_data/hu.v2s2r10k/design.csv" --genome 'GRCh38-1.2.0' --kitVersion 'two' --version '2.1.1' + - nextflow run workflow/main.nf --fastq "test_data/hu.v2s2r10k/*.fastq.gz" --designFile "test_data/hu.v2s2r10k/design.csv" --genome 'GRCh38-1.2.0' --kitVersion 'two' --version '2.1.1' -with-tower - pytest -m count211 artifacts: name: "$CI_JOB_NAME" diff --git a/CHANGELOG.md b/CHANGELOG.md index df4bdebb1180a5eb2ed19928d12262bf84bd551e..599997e647ecb00d1b6466b7215cac19435d0419 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# v1.3.0 (in development) +**User Facing** + +**Background** +* Add Nextflow Tower integration into CI (GHH's profile) + +*Known Bugs* + # v1.2.0 **User Facing** * Add Cellranger Version 3.1.0