Skip to content

Commit

Permalink
Multiqc (#153)
Browse files Browse the repository at this point in the history
Find all multiqc_report.html files
  • Loading branch information
drernie authored Oct 17, 2023
1 parent 6721bc1 commit a3e1182
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 7 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,5 @@ gradle-app.setting
*.icloud
params.yaml
*.old
null
quilt+*
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## [0.7.5] 2023-10-17

- Grab all multiqc subfolders

## [0.7.4] 2023-10-16b

- Actually print the exception stack trace
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ deps:
refresh:
./gradlew --refresh-dependencies dependencies

install:
install: compile
./gradlew copyPluginZip
rm -rf ${HOME}/.nextflow/plugins/$(PROJECT)-${VERSION}
cp -r build/plugins/$(PROJECT)-${VERSION} ${HOME}/.nextflow/plugins/
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ From the command-line, do, e.g.:

```bash
# export NXF_VER=23.04.3
export NXF_PLUGINS_TEST_REPOSITORY=https://github.com/quiltdata/nf-quilt/releases/download/0.7.4/nf-quilt-0.7.4-meta.json
nextflow run main.nf -plugins [email protected].4
export NXF_PLUGINS_TEST_REPOSITORY=https://github.com/quiltdata/nf-quilt/releases/download/0.7.5/nf-quilt-0.7.5-meta.json
nextflow run main.nf -plugins [email protected].5
```

For Tower, you can use the "Pre-run script" to set the environment variables.
Expand Down
6 changes: 4 additions & 2 deletions plugins/nf-quilt/src/main/nextflow/quilt/QuiltProduct.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ ${nextflow}
`${meta['workflow']['stats']['processes']}`
'''
private final static String DEFAULT_SUMMARIZE = '*.md,*.html,*.?sv,*.pdf,multiqc/multiqc_report.html'
private final static String DEFAULT_SUMMARIZE = '*.md,*.html,*.?sv,*.pdf,igv.json,**/multiqc_report.html'

private final static String[] BIG_KEYS = [
'nextflow', 'commandLine', 'scriptFile', 'projectDir',
Expand Down Expand Up @@ -143,7 +143,9 @@ ${nextflow}
}
catch (Exception e) {
log.error("publish failed:", e)
throw e
print("FAILED: $pkg\n")
return
// throw e
}
print("SUCCESS: $pkg\n")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ class QuiltPackage {
builder.setMetadata((ObjectNode)mapper.valueToTree(fullMeta))

Manifest m = builder.build()

log.debug("QuiltPackage.push", m)
m.push(namespace, "nf-quilt:${today()}-${msg}", parsed.workflowName)
}

Expand Down
2 changes: 1 addition & 1 deletion plugins/nf-quilt/src/resources/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Plugin-Class: nextflow.quilt.QuiltPlugin
Plugin-Id: nf-quilt
Plugin-Version: 0.7.4
Plugin-Version: 0.7.5
Plugin-Provider: Quilt Data
Plugin-Requires: >=22.10.6

0 comments on commit a3e1182

Please sign in to comment.