Skip to content

Commit aa983f0

Browse files
authored
Merge pull request #462 from JoseEspinosa/merging-template-3.2.1
Merging template 3.2.1
2 parents 5063eb0 + 1a9e923 commit aa983f0

File tree

5 files changed

+25
-45
lines changed

5 files changed

+25
-45
lines changed

.github/workflows/awsfulltest.yml

Lines changed: 10 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,61 +4,39 @@ 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/chipseq' && 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/chipseq' && 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
strategy:
2220
matrix:
2321
aligner: ["bwa", "bowtie2", "chromap", "star"]
2422
steps:
25-
- name: Get PR reviews
26-
uses: octokit/[email protected]
27-
if: github.event_name != 'workflow_dispatch'
28-
id: check_approvals
29-
continue-on-error: true
30-
with:
31-
route: GET /repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/reviews?per_page=100
32-
env:
33-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
34-
35-
- name: Check for approvals
36-
if: ${{ failure() && github.event_name != 'workflow_dispatch' }}
37-
run: |
38-
echo "No review approvals found. At least 2 approvals are required to run this action automatically."
39-
exit 1
40-
41-
- name: Check for enough approvals (>=2)
42-
id: test_variables
43-
if: github.event_name != 'workflow_dispatch'
23+
- name: Set revision variable
24+
id: revision
4425
run: |
45-
JSON_RESPONSE='${{ steps.check_approvals.outputs.data }}'
46-
CURRENT_APPROVALS_COUNT=$(echo $JSON_RESPONSE | jq -c '[.[] | select(.state | contains("APPROVED")) ] | length')
47-
test $CURRENT_APPROVALS_COUNT -ge 2 || exit 1 # At least 2 approvals are required
26+
echo "revision=${{ (github.event_name == 'workflow_dispatch' || github.event_name == 'release') && github.sha || 'dev' }}" >> "$GITHUB_OUTPUT"
4827
4928
- name: Launch workflow via Seqera Platform
5029
uses: seqeralabs/action-tower-launch@v2
5130
with:
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/chipseq/work-${{ github.sha }}
34+
revision: ${{ steps.revision.outputs.revision }}
35+
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/chipseq/work-${{ steps.revision.outputs.revision }}
5736
parameters: |
5837
{
5938
"hook_url": "${{ secrets.MEGATESTS_ALERTS_SLACK_HOOK_URL }}",
60-
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/chipseq/results-${{ github.sha }}",
61-
"aligner": "${{ matrix.aligner }}"
39+
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/chipseq/results-${{ steps.revision.outputs.revision }}"
6240
}
6341
profiles: test_full
6442

.github/workflows/ci.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ jobs:
5858
if: matrix.profile == 'singularity'
5959
uses: eWaterCycle/setup-apptainer@main
6060

61-
- name: Run pipeline with test data (docker)
61+
- name: Set up Singularity
62+
if: matrix.profile == 'singularity'
6263
run: |
6364
mkdir -p $NXF_SINGULARITY_CACHEDIR
6465
mkdir -p $NXF_SINGULARITY_LIBRARYDIR
@@ -72,18 +73,19 @@ jobs:
7273
conda-solver: libmamba
7374
channels: conda-forge,bioconda
7475

75-
- name: Run pipeline with test data (singularity)
76+
- name: Set up Conda
77+
if: matrix.profile == 'conda'
7678
run: |
7779
echo $(realpath $CONDA)/condabin >> $GITHUB_PATH
7880
echo $(realpath python) >> $GITHUB_PATH
7981
8082
- name: Clean up Disk space
8183
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
8284

83-
- name: Run pipeline with test data (conda)
85+
- name: "Run pipeline with test data ${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }}"
86+
continue-on-error: ${{ matrix.NXF_VER == 'latest-everything' }}
8487
run: |
85-
nextflow run ${GITHUB_WORKSPACE} -profile test,conda --outdir ./results
86-
if: "${{ github.base_ref == 'master' }}"
88+
nextflow run ${GITHUB_WORKSPACE} -profile test,${{ matrix.profile }} --outdir ./results
8789
8890
parameters:
8991
name: Test workflow parameters

.nf-core.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ lint:
33
- config_defaults:
44
- params.bamtools_filter_se_config
55
- params.bamtools_filter_pe_config
6-
nf_core_version: 3.2.0
6+
nf_core_version: 3.2.1
77
repository_type: pipeline
88
template:
99
author: Espinosa-Carrasco J, Patel H, Wang C, Ewels P

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111
- [[PR #434](https://github.com/nf-core/chipseq/pull/434)] - Prevent pipeline fails from erroneous param validation when igenomes is used.
1212
- [[#432](https://github.com/nf-core/chipseq/issues/432)] - Fix `GFFREAD` call to have the two expected input channels.
1313
- [[PR #444](https://github.com/nf-core/chipseq/pull/444)] - Add empty map to ch_gff so that when provided by the user `GFFREAD` works.
14-
- Updated pipeline template to [nf-core/tools 3.2.0](https://github.com/nf-core/tools/releases/tag/3.2.0).
1514
- [[#451](https://github.com/nf-core/chipseq/issues/451)] - Pass `map.single_read` to `SUBREAD_FEATURECOUNTS` as to correctly set parameter `-p`.
15+
- [[PR #462](https://github.com/nf-core/chipseq/pull/462)] - Updated pipeline template to [nf-core/tools 3.2.1](https://github.com/nf-core/tools/releases/tag/3.2.1)
1616

1717
### Parameters
1818

ro-crate-metadata.json

Lines changed: 6 additions & 6 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:44:38+00:00",
25+
"datePublished": "2025-04-30T12:25:55+00:00",
2626
"description": "<h1>\n <picture>\n <source media=\"(prefers-color-scheme: dark)\" srcset=\"docs/images/nf-core-chipseq_logo_dark.png\">\n <img alt=\"nf-core/chipseq\" src=\"docs/images/nf-core-chipseq_logo_light.png\">\n </picture>\n</h1>\n\n[![GitHub Actions CI Status](https://github.com/nf-core/chipseq/actions/workflows/ci.yml/badge.svg)](https://github.com/nf-core/chipseq/actions/workflows/ci.yml)\n[![GitHub Actions Linting Status](https://github.com/nf-core/chipseq/actions/workflows/linting.yml/badge.svg)](https://github.com/nf-core/chipseq/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/chipseq/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/chipseq)\n\n[![Get help on Slack](http://img.shields.io/badge/slack-nf--core%20%23chipseq-4A154B?labelColor=000000&logo=slack)](https://nfcore.slack.com/channels/chipseq)[![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/chipseq** 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/chipseq \\\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/chipseq/usage) and the [parameter documentation](https://nf-co.re/chipseq/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/chipseq/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/chipseq/output).\n\n## Credits\n\nnf-core/chipseq was originally written by Espinosa-Carrasco J, Patel H, Wang C, Ewels P.\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 `#chipseq` channel](https://nfcore.slack.com/channels/chipseq) (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/chipseq 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": "#a198f2b1-ce70-44ed-a64f-2c5e386fee8f"
102+
"@id": "#be26b39c-8ae7-447d-a6dd-8b423bd521ec"
103103
}
104104
],
105105
"name": "nf-core/chipseq"
@@ -123,7 +123,7 @@
123123
"@id": "main.nf",
124124
"@type": ["File", "SoftwareSourceCode", "ComputationalWorkflow"],
125125
"dateCreated": "",
126-
"dateModified": "2025-01-27T14:44:38Z",
126+
"dateModified": "2025-04-30T12:25:55Z",
127127
"dct:conformsTo": "https://bioschemas.org/profiles/ComputationalWorkflow/1.0-RELEASE/",
128128
"keywords": [
129129
"nf-core",
@@ -158,11 +158,11 @@
158158
"version": "!>=24.04.2"
159159
},
160160
{
161-
"@id": "#a198f2b1-ce70-44ed-a64f-2c5e386fee8f",
161+
"@id": "#be26b39c-8ae7-447d-a6dd-8b423bd521ec",
162162
"@type": "TestSuite",
163163
"instance": [
164164
{
165-
"@id": "#23cae47c-f2c2-409a-8db5-e4b53e248092"
165+
"@id": "#ab6a8ea3-81bb-44bf-a564-11b2997ed6d3"
166166
}
167167
],
168168
"mainEntity": {
@@ -171,7 +171,7 @@
171171
"name": "Test suite for nf-core/chipseq"
172172
},
173173
{
174-
"@id": "#23cae47c-f2c2-409a-8db5-e4b53e248092",
174+
"@id": "#ab6a8ea3-81bb-44bf-a564-11b2997ed6d3",
175175
"@type": "TestInstance",
176176
"name": "GitHub Actions workflow for testing nf-core/chipseq",
177177
"resource": "repos/nf-core/chipseq/actions/workflows/ci.yml",

0 commit comments

Comments
 (0)