Skip to content

Commit

Permalink
Removed the test_github profile as test can now be used
Browse files Browse the repository at this point in the history
  • Loading branch information
muffato committed Aug 13, 2024
1 parent edea848 commit 49f5852
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 64 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ jobs:
- name: Run pipeline with test data
run: |
nextflow run ${GITHUB_WORKSPACE} -profile test_github,singularity --outdir ./results
nextflow run ${GITHUB_WORKSPACE} -profile test,singularity --outdir ./results
35 changes: 6 additions & 29 deletions conf/modules.config
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,9 @@ process {
// Set up of the polishing pipeline
if (params.polishing_on) {
withName: LONGRANGER_MKREF {
if(System.getenv('GITHUB_ACTION') != null ) {
container = "ghcr.io/sanger-tol/longranger:2.2.2-c4"
}
publishDir = [
path: { "${params.outdir}/${meta.id}.${params.hifiasm}/polishing" },
mode: params.publish_dir_mode,
Expand All @@ -368,6 +371,9 @@ process {
withName: LONGRANGER_ALIGN {
// Keep in sync with `longranger_lsf_sanger.config`
ext.args = "--disable-ui --nopreflight"
if(System.getenv('GITHUB_ACTION') != null ) {
container = "ghcr.io/sanger-tol/longranger:2.2.2-c4"
}
publishDir = [
path: { "${params.outdir}/${meta.id}.${params.hifiasm}/polishing" },
mode: params.publish_dir_mode,
Expand Down Expand Up @@ -674,33 +680,4 @@ profiles {
}
}
}

test_github {
process {
// Set up of the scaffolding pipeline
withName: 'YAHS' {
// Skip the initial assembly error correction step
ext.args = '-r 1000,2000,5000'
}

withName: '.*HIFIASM.*' {
// Skip bloom filter
ext.args = '--primary -f0'
}

withName: '.*OATK' {
// Set kmer size and minimal coverage
ext.args = "-k1001 -c5 -Ttmp"
}

if (params.polishing_on) {
withName: LONGRANGER_MKREF {
container = "ghcr.io/sanger-tol/longranger:2.2.2-c4"
}
withName: LONGRANGER_ALIGN {
container = "ghcr.io/sanger-tol/longranger:2.2.2-c4"
}
}
}
}
}
7 changes: 3 additions & 4 deletions conf/test.config
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@ params {
config_profile_name = 'Test profile'
config_profile_description = 'Minimal test dataset to check pipeline function'

// Limit resources so that this can run on GitHub Actions
max_cpus = 2
max_memory = '6.GB'
// Match resource limits with the ubuntu2204-4c runner
max_cpus = 4
max_memory = '15.GB'
max_time = '6.h'

// Input data
input = "${projectDir}/assets/test.yaml"
bed_chunks_polishing = 2
organelles_on = true
polishing_on = true
hifiasm_hic_on = true
}
28 changes: 0 additions & 28 deletions conf/test_github.config

This file was deleted.

2 changes: 1 addition & 1 deletion docs/usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ The pipeline can be tested locally using a provided small test dataset:
```
git clone [email protected]:sanger-tol/genomeassembly.git
cd genomeassembly/
nextflow run main.nf -profile test_github,singularity --outdir ${OUTDIR} {OTHER ARGUMENTS}
nextflow run main.nf -profile test,singularity --outdir ${OUTDIR} {OTHER ARGUMENTS}
```

These command line steps will download the pipeline and run the test.
Expand Down
1 change: 0 additions & 1 deletion nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ profiles {
executor.memory = 60.GB
}
test { includeConfig 'conf/test.config' }
test_github { includeConfig 'conf/test_github.config' }
test_full { includeConfig 'conf/test_full.config' }
}

Expand Down

0 comments on commit 49f5852

Please sign in to comment.