diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b0e8d2578eeab946e9b50757068dd9920447606a..e3e052a7183a13fb2d147db32bc03260a34c3d36 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -181,7 +181,7 @@ dedupData: echo "samtools view -b Q-Y5F6_1M.se.sorted.deduped.bam ${i} > Q-Y5F6_1M.se.sorted.deduped.${i}.bam; samtools index -@ 20 -b Q-Y5F6_1M.se.sorted.deduped.${i}.bam Q-Y5F6_1M.se.sorted.deduped.${i}.bam.bai;"; done | singularity run 'docker://bicf/gudmaprbkdedup:2.0.0' parallel -j 20 -k - pytest -m dedupData - - singularity run 'docker://bicf/gudmaprbkdedup:2.0.0' java -jar /picard/build/libs/picard.jar MarkDuplicates --version &> version_markdups.txt + - singularity run 'docker://bicf/gudmaprbkdedup:2.0.0' java -jar /picard/build/libs/picard.jar MarkDuplicates &> version_markdups.txt - singularity run 'docker://bicf/gudmaprbkdedup:2.0.0' samtools --version > version_samtools.txt artifacts: name: "$CI_JOB_NAME" diff --git a/workflow/scripts/generate_versions.py b/workflow/scripts/generate_versions.py index 57e5a1f6084f9193897edb93357dd753c8bb28fa..f3d381b6f54934f52708af9d419298fd0034e72c 100644 --- a/workflow/scripts/generate_versions.py +++ b/workflow/scripts/generate_versions.py @@ -38,13 +38,13 @@ SOFTWARE_REGEX = { 'Trim Galore!': ['version_trimgalore.txt', r"version (\S+)"], 'HISAT2': ['version_hisat.txt', r"/hisat2-2.1.0/hisat2-align-s version (\S+)"], 'Samtools': ['version_samtools.txt', r"samtools (\S+)"], - 'picard (MarkDuplicates)': ['version_markdups.txt', r"(\S+)"], + 'picard (MarkDuplicates)': ['version_markdups.txt', r"Version: (\S+)"], 'featureCounts': ['version_featurecounts.txt', r"featureCounts v(\S+)"], 'R': ['version_r.txt', r"R version (\S+)"], 'deepTools': ['version_deeptools.txt', r"deeptools (\S+)"], 'FastQC': ['version_fastqc.txt', r"FastQC v(\S+)"], 'MultiQC': ['version_multiqc.txt', r"multiqc, version (\S+)"], - "Pipeline Version": ['./workflow/nextflow.config', r"version = 'v(\S+)'"] + 'Pipeline Version': ['./workflow/nextflow.config', r"version = 'v(\S+)'"] }