diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 72b63f1e9b8ea52b84cc02386a72aad9ce0db440..eb44569784c41e056da3f7d23181c8a6550f4849 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,10 +1,12 @@ # Gitlab CI Script for astrocyte/rnaseq # Brandi L. Cantarel - 2017 +variables: + GIT_SUBMODULE_STRATEGY: recursive + before_script: - - module load nextflow/0.31.0 - - git submodule sync --recursive - - git submodule update --init --recursive + - module load nextflow/20.01.0 + - module load singularity/3.0.2 stages: - integration @@ -12,13 +14,13 @@ stages: test_human: stage: integration script: - - nextflow run -with-dag flowchart.png -with-timeline human_timeline.html -with-report human_report.html workflow/main.nf --design /project/shared/bicf_workflow_ref/workflow_testdata/rnaseq/design.rnaseq.txt --input /project/shared/bicf_workflow_ref/workflow_testdata/rnaseq --output human_output + - nextflow run -c nextflow.config -with-dag flowchart.png -with-timeline human_timeline.html -with-report human_report.html workflow/main.nf --design /project/shared/bicf_workflow_ref/workflow_testdata/rnaseq/design.rnaseq.txt --input /project/shared/bicf_workflow_ref/workflow_testdata/rnaseq --output human_output artifacts: expire_in: 2 days test_mouse: stage: integration script: - - nextflow run -with-dag flowchart.png -with-timeline mouse_timeline.html -with-report mouse_report.html workflow/main.nf --input /project/shared/bicf_workflow_ref/workflow_testdata/rnaseq --design /project/shared/bicf_workflow_ref/workflow_testdata/rnaseq/mouse_se.design.txt --pairs se --fusion skip --genome /project/shared/bicf_workflow_ref/mouse/GRCm38 --markdups null --output mouse_output + - nextflow run -c nextflow.config -with-dag flowchart.png -with-timeline mouse_timeline.html -with-report mouse_report.html workflow/main.nf --input /project/shared/bicf_workflow_ref/workflow_testdata/rnaseq --design /project/shared/bicf_workflow_ref/workflow_testdata/rnaseq/mouse_se.design.txt --pairs se --fusion skip --genome /project/shared/bicf_workflow_ref/mouse/GRCm38 --markdups null --output mouse_output artifacts: expire_in: 2 days diff --git a/.gitmodules b/.gitmodules index 0242dee412031e1290cd19266bcb68035939fcaf..6f01ffb43bed7c8bf0024976c806a4ccd840884a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "workflow/process_scripts"] path = workflow/process_scripts - url = git@git.biohpc.swmed.edu:ngsclialab/process_scripts.git + url = ../../../ngsclialab/process_scripts.git diff --git a/nextflow.config b/nextflow.config index 079d7ea857879537190b9fcfb1bb68fbfc176f0c..150748a34379cf059276d0144009eb1943283927 100644 --- a/nextflow.config +++ b/nextflow.config @@ -40,7 +40,7 @@ process { singularity { enabled = true runOptions='--no-home --cleanenv' - cacheDir="$PWD" + singularity.cacheDir="$PWD" } trace {