Skip to content

Commit bbf814c

Browse files
authored
Merge pull request #881 from d4straub/merging-template-updates_2-3-1
Merged changes from nf-core template 3.2.1
2 parents 59b702f + 3a53502 commit bbf814c

File tree

4 files changed

+21
-40
lines changed

4 files changed

+21
-40
lines changed

.github/workflows/awsfulltest.yml

+10-30
Original file line numberDiff line numberDiff line change
@@ -4,56 +4,36 @@ name: nf-core AWS full size tests
44
# It runs the -profile 'test_full' on AWS batch
55

66
on:
7-
pull_request:
8-
branches:
9-
- main
10-
- master
117
workflow_dispatch:
128
pull_request_review:
139
types: [submitted]
10+
release:
11+
types: [published]
1412

1513
jobs:
1614
run-platform:
1715
name: Run AWS full tests
18-
# run only if the PR is approved by at least 2 reviewers and against the master branch or manually triggered
19-
if: github.repository == 'nf-core/ampliseq' && github.event.review.state == 'approved' && github.event.pull_request.base.ref == 'master' || github.event_name == 'workflow_dispatch'
16+
# run only if the PR is approved by at least 2 reviewers and against the master/main branch or manually triggered
17+
if: github.repository == 'nf-core/ampliseq' && github.event.review.state == 'approved' && (github.event.pull_request.base.ref == 'master' || github.event.pull_request.base.ref == 'main') || github.event_name == 'workflow_dispatch'
2018
runs-on: ubuntu-latest
2119
steps:
22-
- name: Get PR reviews
23-
uses: octokit/[email protected]
24-
if: github.event_name != 'workflow_dispatch'
25-
id: check_approvals
26-
continue-on-error: true
27-
with:
28-
route: GET /repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/reviews?per_page=100
29-
env:
30-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31-
32-
- name: Check for approvals
33-
if: ${{ failure() && github.event_name != 'workflow_dispatch' }}
20+
- name: Set revision variable
21+
id: revision
3422
run: |
35-
echo "No review approvals found. At least 2 approvals are required to run this action automatically."
36-
exit 1
23+
echo "revision=${{ (github.event_name == 'workflow_dispatch' || github.event_name == 'release') && github.sha || 'dev' }}" >> "$GITHUB_OUTPUT"
3724
38-
- name: Check for enough approvals (>=2)
39-
id: test_variables
40-
if: github.event_name != 'workflow_dispatch'
41-
run: |
42-
JSON_RESPONSE='${{ steps.check_approvals.outputs.data }}'
43-
CURRENT_APPROVALS_COUNT=$(echo $JSON_RESPONSE | jq -c '[.[] | select(.state | contains("APPROVED")) ] | length')
44-
test $CURRENT_APPROVALS_COUNT -ge 2 || exit 1 # At least 2 approvals are required
4525
- name: Launch workflow via Seqera Platform
4626
uses: seqeralabs/action-tower-launch@v2
4727
with:
4828
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
4929
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
5030
compute_env: ${{ secrets.TOWER_COMPUTE_ENV }}
51-
revision: ${{ github.sha }}
52-
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/ampliseq/work-${{ github.sha }}
31+
revision: ${{ steps.revision.outputs.revision }}
32+
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/ampliseq/work-${{ steps.revision.outputs.revision }}
5333
parameters: |
5434
{
5535
"hook_url": "${{ secrets.MEGATESTS_ALERTS_SLACK_HOOK_URL }}",
56-
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/ampliseq/results-${{ github.sha }}"
36+
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/ampliseq/results-${{ steps.revision.outputs.revision }}"
5737
}
5838
profiles: test_full
5939

.nf-core.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ lint:
99
- params.report_template
1010
- params.report_css
1111
- params.report_logo
12-
nf_core_version: 3.2.0
12+
nf_core_version: 3.2.1
1313
repository_type: pipeline
1414
template:
1515
author: Daniel Straub, Alexander Peltzer

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2626
- [#872](https://github.com/nf-core/ampliseq/pull/872) - Follow nextflow's strict syntax
2727
- [#876](https://github.com/nf-core/ampliseq/pull/876) - Pulled the updated vsearch/clusters module from nf-core to fix a bug where a wildcard expansion trigging an arguments-too-long error.
2828
- [#878](https://github.com/nf-core/ampliseq/pull/878) - Downgraded nf-schema from 2.3.0 to 2.2.0 due to incompatibilities with nextflow stable versions 25.05 and newer
29+
- [#881](https://github.com/nf-core/ampliseq/pull/881) - Template update for nf-core/tools version 3.2.1
2930

3031
### `Dependencies`
3132

ro-crate-metadata.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
{
2222
"@id": "./",
2323
"@type": "Dataset",
24-
"creativeWorkStatus": "InProgress",
25-
"datePublished": "2025-01-27T14:44:28+00:00",
24+
"creativeWorkStatus": "Stable",
25+
"datePublished": "2025-04-30T12:25:47+00:00",
2626
"description": "<h1>\n <picture>\n <source media=\"(prefers-color-scheme: dark)\" srcset=\"docs/images/nf-core-ampliseq_logo_dark.png\">\n <img alt=\"nf-core/ampliseq\" src=\"docs/images/nf-core-ampliseq_logo_light.png\">\n </picture>\n</h1>\n\n[![GitHub Actions CI Status](https://github.com/nf-core/ampliseq/actions/workflows/ci.yml/badge.svg)](https://github.com/nf-core/ampliseq/actions/workflows/ci.yml)\n[![GitHub Actions Linting Status](https://github.com/nf-core/ampliseq/actions/workflows/linting.yml/badge.svg)](https://github.com/nf-core/ampliseq/actions/workflows/linting.yml)[![AWS CI](https://img.shields.io/badge/CI%20tests-full%20size-FF9900?labelColor=000000&logo=Amazon%20AWS)](https://nf-co.re/ampliseq/results)[![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.XXXXXXX-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.XXXXXXX)\n[![nf-test](https://img.shields.io/badge/unit_tests-nf--test-337ab7.svg)](https://www.nf-test.com)\n\n[![Nextflow](https://img.shields.io/badge/nextflow%20DSL2-%E2%89%A524.04.2-23aa62.svg)](https://www.nextflow.io/)\n[![run with conda](http://img.shields.io/badge/run%20with-conda-3EB049?labelColor=000000&logo=anaconda)](https://docs.conda.io/en/latest/)\n[![run with docker](https://img.shields.io/badge/run%20with-docker-0db7ed?labelColor=000000&logo=docker)](https://www.docker.com/)\n[![run with singularity](https://img.shields.io/badge/run%20with-singularity-1d355c.svg?labelColor=000000)](https://sylabs.io/docs/)\n[![Launch on Seqera Platform](https://img.shields.io/badge/Launch%20%F0%9F%9A%80-Seqera%20Platform-%234256e7)](https://cloud.seqera.io/launch?pipeline=https://github.com/nf-core/ampliseq)\n\n[![Get help on Slack](http://img.shields.io/badge/slack-nf--core%20%23ampliseq-4A154B?labelColor=000000&logo=slack)](https://nfcore.slack.com/channels/ampliseq)[![Follow on Twitter](http://img.shields.io/badge/twitter-%40nf__core-1DA1F2?labelColor=000000&logo=twitter)](https://twitter.com/nf_core)[![Follow on Mastodon](https://img.shields.io/badge/mastodon-nf__core-6364ff?labelColor=FFFFFF&logo=mastodon)](https://mstdn.science/@nf_core)[![Watch on YouTube](http://img.shields.io/badge/youtube-nf--core-FF0000?labelColor=000000&logo=youtube)](https://www.youtube.com/c/nf-core)\n\n## Introduction\n\n**nf-core/ampliseq** is a bioinformatics pipeline that ...\n\n<!-- TODO nf-core:\n Complete this sentence with a 2-3 sentence summary of what types of data the pipeline ingests, a brief overview of the\n major pipeline sections and the types of output it produces. You're giving an overview to someone new\n to nf-core here, in 15-20 seconds. For an example, see https://github.com/nf-core/rnaseq/blob/master/README.md#introduction\n-->\n\n<!-- TODO nf-core: Include a figure that guides the user through the major workflow steps. Many nf-core\n workflows use the \"tube map\" design for that. See https://nf-co.re/docs/contributing/design_guidelines#examples for examples. -->\n<!-- TODO nf-core: Fill in short bullet-pointed list of the default steps in the pipeline -->1. Read QC ([`FastQC`](https://www.bioinformatics.babraham.ac.uk/projects/fastqc/))2. Present QC for raw reads ([`MultiQC`](http://multiqc.info/))\n\n## Usage\n\n> [!NOTE]\n> If you are new to Nextflow and nf-core, please refer to [this page](https://nf-co.re/docs/usage/installation) on how to set-up Nextflow. Make sure to [test your setup](https://nf-co.re/docs/usage/introduction#how-to-run-a-pipeline) with `-profile test` before running the workflow on actual data.\n\n<!-- TODO nf-core: Describe the minimum required steps to execute the pipeline, e.g. how to prepare samplesheets.\n Explain what rows and columns represent. For instance (please edit as appropriate):\n\nFirst, prepare a samplesheet with your input data that looks as follows:\n\n`samplesheet.csv`:\n\n```csv\nsample,fastq_1,fastq_2\nCONTROL_REP1,AEG588A1_S1_L002_R1_001.fastq.gz,AEG588A1_S1_L002_R2_001.fastq.gz\n```\n\nEach row represents a fastq file (single-end) or a pair of fastq files (paired end).\n\n-->\n\nNow, you can run the pipeline using:\n\n<!-- TODO nf-core: update the following command to include all required parameters for a minimal example -->\n\n```bash\nnextflow run nf-core/ampliseq \\\n -profile <docker/singularity/.../institute> \\\n --input samplesheet.csv \\\n --outdir <OUTDIR>\n```\n\n> [!WARNING]\n> Please provide pipeline parameters via the CLI or Nextflow `-params-file` option. Custom config files including those provided by the `-c` Nextflow option can be used to provide any configuration _**except for parameters**_; see [docs](https://nf-co.re/docs/usage/getting_started/configuration#custom-configuration-files).\n\nFor more details and further functionality, please refer to the [usage documentation](https://nf-co.re/ampliseq/usage) and the [parameter documentation](https://nf-co.re/ampliseq/parameters).\n\n## Pipeline output\n\nTo see the results of an example test run with a full size dataset refer to the [results](https://nf-co.re/ampliseq/results) tab on the nf-core website pipeline page.\nFor more details about the output files and reports, please refer to the\n[output documentation](https://nf-co.re/ampliseq/output).\n\n## Credits\n\nnf-core/ampliseq was originally written by Daniel Straub, Alexander Peltzer.\n\nWe thank the following people for their extensive assistance in the development of this pipeline:\n\n<!-- TODO nf-core: If applicable, make list of people who have also contributed -->\n\n## Contributions and Support\n\nIf you would like to contribute to this pipeline, please see the [contributing guidelines](.github/CONTRIBUTING.md).\n\nFor further information or help, don't hesitate to get in touch on the [Slack `#ampliseq` channel](https://nfcore.slack.com/channels/ampliseq) (you can join with [this invite](https://nf-co.re/join/slack)).\n\n## Citations\n\n<!-- TODO nf-core: Add citation for pipeline after first release. Uncomment lines below and update Zenodo doi and badge at the top of this file. -->\n<!-- If you use nf-core/ampliseq for your analysis, please cite it using the following doi: [10.5281/zenodo.XXXXXX](https://doi.org/10.5281/zenodo.XXXXXX) -->\n\n<!-- TODO nf-core: Add bibliography of tools and data used in your pipeline -->\n\nAn extensive list of references for the tools used by the pipeline can be found in the [`CITATIONS.md`](CITATIONS.md) file.\n\nYou can cite the `nf-core` publication as follows:\n\n> **The nf-core framework for community-curated bioinformatics pipelines.**\n>\n> Philip Ewels, Alexander Peltzer, Sven Fillinger, Harshil Patel, Johannes Alneberg, Andreas Wilm, Maxime Ulysse Garcia, Paolo Di Tommaso & Sven Nahnsen.\n>\n> _Nat Biotechnol._ 2020 Feb 13. doi: [10.1038/s41587-020-0439-x](https://dx.doi.org/10.1038/s41587-020-0439-x).\n",
2727
"hasPart": [
2828
{
@@ -99,7 +99,7 @@
9999
},
100100
"mentions": [
101101
{
102-
"@id": "#3df56a0c-2257-41e1-a497-e6f32848489f"
102+
"@id": "#b27d676c-2d97-4593-b6f3-71caf9ba5168"
103103
}
104104
],
105105
"name": "nf-core/ampliseq"
@@ -128,7 +128,7 @@
128128
}
129129
],
130130
"dateCreated": "",
131-
"dateModified": "2025-01-27T14:44:28Z",
131+
"dateModified": "2025-04-30T12:25:47Z",
132132
"dct:conformsTo": "https://bioschemas.org/profiles/ComputationalWorkflow/1.0-RELEASE/",
133133
"keywords": [
134134
"nf-core",
@@ -162,8 +162,8 @@
162162
"sdPublisher": {
163163
"@id": "https://nf-co.re/"
164164
},
165-
"url": ["https://github.com/nf-core/ampliseq", "https://nf-co.re/ampliseq/dev/"],
166-
"version": ["2.13.0dev"]
165+
"url": ["https://github.com/nf-core/ampliseq", "https://nf-co.re/ampliseq/2.13.0/"],
166+
"version": ["2.13.0"]
167167
},
168168
{
169169
"@id": "https://w3id.org/workflowhub/workflow-ro-crate#nextflow",
@@ -178,11 +178,11 @@
178178
"version": "!>=24.04.2"
179179
},
180180
{
181-
"@id": "#3df56a0c-2257-41e1-a497-e6f32848489f",
181+
"@id": "#b27d676c-2d97-4593-b6f3-71caf9ba5168",
182182
"@type": "TestSuite",
183183
"instance": [
184184
{
185-
"@id": "#5ecd37ed-b3cb-42ff-9864-a75f9df2872c"
185+
"@id": "#3fc0a16f-7585-4ca4-8f9d-90b729aa5724"
186186
}
187187
],
188188
"mainEntity": {
@@ -191,7 +191,7 @@
191191
"name": "Test suite for nf-core/ampliseq"
192192
},
193193
{
194-
"@id": "#5ecd37ed-b3cb-42ff-9864-a75f9df2872c",
194+
"@id": "#3fc0a16f-7585-4ca4-8f9d-90b729aa5724",
195195
"@type": "TestInstance",
196196
"name": "GitHub Actions workflow for testing nf-core/ampliseq",
197197
"resource": "repos/nf-core/ampliseq/actions/workflows/ci.yml",

0 commit comments

Comments
 (0)