diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 32d1680..3a049c4 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -1,6 +1,6 @@ name: CI Tests -on: [push, pull_request] +on: [push] jobs: test: diff --git a/main.nf b/main.nf index 62de5d7..eb5a500 100644 --- a/main.nf +++ b/main.nf @@ -44,11 +44,10 @@ workflow { } if(params.modules.runAssembly && !params.r2c.useAssembledContigs) { - ASSEMBLY(params.assembly.plus(params.shared), paired, unpaired, avgLen) - contigs = ASSEMBLY.out.outContigs + ASSEMBLY(params.assembly.plus(params.shared), paired, unpaired, avgLen) + contigs = ASSEMBLY.out.outContigs + READSTOCONTIGS(params.r2c.plus(params.shared), paired, unpaired, contigs) } - READSTOCONTIGS(params.r2c.plus(params.shared), paired, unpaired, contigs) - } \ No newline at end of file diff --git a/modules/runReadsToContig/Dockerfile b/modules/runReadsToContig/Dockerfile index 8ffea85..bd023d4 100644 --- a/modules/runReadsToContig/Dockerfile +++ b/modules/runReadsToContig/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM continuumio/miniconda3:23.5.2-0 AS build +FROM continuumio/miniconda3:main AS build ENV container=docker @@ -14,6 +14,7 @@ RUN conda init bash \ RUN conda install -n readsToContig -c conda-forge r-base RUN conda install -n readsToContig -c conda-forge python=3.11 +RUN conda install -n readsToContig -c bioconda minimap2=2.24 RUN conda install -n readsToContig -c bioconda perl-json RUN conda install -n readsToContig -c bioconda samclip=0.4.0 RUN conda install -n readsToContig -c bioconda bwa @@ -39,6 +40,7 @@ FROM debian:buster AS runtime #RUN apk add --no-cache bash COPY --from=build /venv /venv +RUN apt-get update && apt-get install procps -y && apt-get clean ENV PERL5LIB=/venv/lib/perl5/core_perl ENV PATH=/venv/bin:$PATH diff --git a/nextflow.config b/nextflow.config index 956f22c..d05751a 100644 --- a/nextflow.config +++ b/nextflow.config @@ -141,7 +141,7 @@ process { container = 'apwat/run_assembly:1.5' } withLabel: 'r2c' { - container = 'apwat/run_r2c:1.3' + container = 'apwat/run_r2c:1.6' } } diff --git a/tests/modules/runAssembly/runAssembly.nf.test b/tests/modules/runAssembly/runAssembly.nf.test index 2fbb7dc..e33679a 100644 --- a/tests/modules/runAssembly/runAssembly.nf.test +++ b/tests/modules/runAssembly/runAssembly.nf.test @@ -79,6 +79,9 @@ nextflow_workflow { } assembly{ assembler = "lrasm" + lrasm { + ec = true + } } } workflow {