Skip to content

Commit 28c4676

Browse files
authored
Merge pull request #1133 from nf-core/nf-core-template-merge-3.2.1
Important! Template update for nf-core/tools v3.2.1
2 parents 248545e + 850ba3d commit 28c4676

File tree

5 files changed

+27
-47
lines changed

5 files changed

+27
-47
lines changed

.github/workflows/awsfulltest.yml

Lines changed: 10 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,44 +4,23 @@ 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/eager' && 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/eager' && 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' }}
34-
run: |
35-
echo "No review approvals found. At least 2 approvals are required to run this action automatically."
36-
exit 1
37-
38-
- name: Check for enough approvals (>=2)
39-
id: test_variables
40-
if: github.event_name != 'workflow_dispatch'
20+
- name: Set revision variable
21+
id: revision
4122
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
23+
echo "revision=${{ (github.event_name == 'workflow_dispatch' || github.event_name == 'release') && github.sha || 'dev' }}" >> "$GITHUB_OUTPUT"
4524
4625
- name: Launch workflow via Seqera Platform
4726
uses: seqeralabs/action-tower-launch@v2
@@ -52,12 +31,12 @@ jobs:
5231
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
5332
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
5433
compute_env: ${{ secrets.TOWER_COMPUTE_ENV }}
55-
revision: ${{ github.sha }}
56-
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/eager/work-${{ github.sha }}
34+
revision: ${{ steps.revision.outputs.revision }}
35+
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/eager/work-${{ steps.revision.outputs.revision }}
5736
parameters: |
5837
{
5938
"hook_url": "${{ secrets.MEGATESTS_ALERTS_SLACK_HOOK_URL }}",
60-
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/eager/results-${{ github.sha }}"
39+
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/eager/results-${{ steps.revision.outputs.revision }}"
6140
}
6241
profiles: test_full
6342

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,5 +93,6 @@ jobs:
9393
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
9494

9595
- name: "Run pipeline with test data ${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }}"
96+
continue-on-error: ${{ matrix.NXF_VER == 'latest-everything' }}
9697
run: |
9798
nextflow run ${GITHUB_WORKSPACE} -profile ${{matrix.profile}},${{ matrix.test_name }}${{ matrix.PARAMS }} --outdir ./results

.nf-core.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ lint:
22
nextflow_config:
33
- config_defaults:
44
- params.contamination_estimation_angsd_hapmap
5-
nf_core_version: 3.2.0
5+
nf_core_version: 3.2.1
66
repository_type: pipeline
77
template:
88
author: The nf-core/eager community

nextflow.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ manifest {
611611

612612
// Nextflow plugins
613613
plugins {
614-
id 'nf-schema@2.3.0' // Validation of pipeline parameters and creation of an input channel from a sample sheet
614+
id 'nf-schema@2.2.0' // Validation of pipeline parameters and creation of an input channel from a sample sheet
615615
}
616616

617617
validation {

ro-crate-metadata.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"@id": "./",
2323
"@type": "Dataset",
2424
"creativeWorkStatus": "InProgress",
25-
"datePublished": "2025-01-27T14:46:50+00:00",
25+
"datePublished": "2025-04-30T12:26:13+00:00",
2626
"description": "<h1>\n <picture>\n <source media=\"(prefers-color-scheme: dark)\" srcset=\"docs/images/nf-core-eager_logo_dark.png\">\n <img alt=\"nf-core/eager\" src=\"docs/images/nf-core-eager_logo_light.png\">\n </picture>\n</h1>\n\n[![GitHub Actions CI Status](https://github.com/nf-core/eager/actions/workflows/ci.yml/badge.svg)](https://github.com/nf-core/eager/actions/workflows/ci.yml)\n[![GitHub Actions Linting Status](https://github.com/nf-core/eager/actions/workflows/linting.yml/badge.svg)](https://github.com/nf-core/eager/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/eager/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/eager)\n\n[![Get help on Slack](http://img.shields.io/badge/slack-nf--core%20%23eager-4A154B?labelColor=000000&logo=slack)](https://nfcore.slack.com/channels/eager)[![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/eager** 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/eager \\\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/eager/usage) and the [parameter documentation](https://nf-co.re/eager/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/eager/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/eager/output).\n\n## Credits\n\nnf-core/eager was originally written by The nf-core/eager community.\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 `#eager` channel](https://nfcore.slack.com/channels/eager) (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/eager 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": "#5ca0aebb-0f0f-4818-bed4-f6d4e3485567"
102+
"@id": "#4726d498-98f0-43b6-badb-2a00f2ecff9d"
103103
}
104104
],
105105
"name": "nf-core/eager"
@@ -124,14 +124,14 @@
124124
"@type": ["File", "SoftwareSourceCode", "ComputationalWorkflow"],
125125
"creator": [
126126
{
127-
127+
"@id": "https://orcid.org/0000-0002-6503-2180"
128128
},
129129
{
130-
"@id": "https://orcid.org/0000-0002-6503-2180"
130+
131131
}
132132
],
133133
"dateCreated": "",
134-
"dateModified": "2025-01-27T14:46:50Z",
134+
"dateModified": "2025-04-30T12:26:13Z",
135135
"dct:conformsTo": "https://bioschemas.org/profiles/ComputationalWorkflow/1.0-RELEASE/",
136136
"keywords": [
137137
"nf-core",
@@ -168,11 +168,11 @@
168168
"version": "!>=24.04.2"
169169
},
170170
{
171-
"@id": "#5ca0aebb-0f0f-4818-bed4-f6d4e3485567",
171+
"@id": "#4726d498-98f0-43b6-badb-2a00f2ecff9d",
172172
"@type": "TestSuite",
173173
"instance": [
174174
{
175-
"@id": "#caea0434-ab72-44e6-8388-d1c598cc9135"
175+
"@id": "#31e05c49-b313-48c3-ac6c-064e8b017c56"
176176
}
177177
],
178178
"mainEntity": {
@@ -181,7 +181,7 @@
181181
"name": "Test suite for nf-core/eager"
182182
},
183183
{
184-
"@id": "#caea0434-ab72-44e6-8388-d1c598cc9135",
184+
"@id": "#31e05c49-b313-48c3-ac6c-064e8b017c56",
185185
"@type": "TestInstance",
186186
"name": "GitHub Actions workflow for testing nf-core/eager",
187187
"resource": "repos/nf-core/eager/actions/workflows/ci.yml",
@@ -309,17 +309,17 @@
309309
"name": "nf-core",
310310
"url": "https://nf-co.re/"
311311
},
312-
{
313-
"@id": "#[email protected]",
314-
"@type": "Person",
315-
"email": "[email protected]",
316-
"name": "James Fellows Yates"
317-
},
318312
{
319313
"@id": "https://orcid.org/0000-0002-6503-2180",
320314
"@type": "Person",
321315
"email": "[email protected]",
322316
"name": "Alexander Peltzer"
317+
},
318+
{
319+
"@id": "#[email protected]",
320+
"@type": "Person",
321+
"email": "[email protected]",
322+
"name": "James Fellows Yates"
323323
}
324324
]
325325
}

0 commit comments

Comments
 (0)