Skip to content

Commit 43ebfdf

Browse files
committed
Template update for nf-core/tools version 3.3.2
1 parent c2953c3 commit 43ebfdf

File tree

24 files changed

+146
-123
lines changed

24 files changed

+146
-123
lines changed

.github/actions/nf-test/action.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,9 @@ runs:
5454
conda-solver: libmamba
5555
conda-remove-defaults: true
5656

57-
# TODO Skip failing conda tests and document their failures
58-
# https://github.com/nf-core/modules/issues/7017
5957
- name: Run nf-test
6058
shell: bash
6159
env:
62-
NFT_DIFF: ${{ env.NFT_DIFF }}
63-
NFT_DIFF_ARGS: ${{ env.NFT_DIFF_ARGS }}
6460
NFT_WORKDIR: ${{ env.NFT_WORKDIR }}
6561
run: |
6662
nf-test test \

.github/workflows/linting.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
1515

16-
- name: Set up Python 3.12
16+
- name: Set up Python 3.13
1717
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
1818
with:
1919
python-version: "3.13"

.github/workflows/linting_comment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Download lint results
14-
uses: dawidd6/action-download-artifact@4c1e823582f43b179e2cbb49c3eade4e41f992e2 # v10
14+
uses: dawidd6/action-download-artifact@ac66b43f0e6a346234dd65d4d0c8fbb31cb316e5 # v11
1515
with:
1616
workflow: linting.yml
1717
workflow_conclusion: completed

.github/workflows/nf-test.yml

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
name: Run nf-test
22
on:
3-
push:
4-
paths-ignore:
5-
- "docs/**"
6-
- "**/meta.yml"
7-
- "**/*.md"
8-
- "**/*.png"
9-
- "**/*.svg"
103
pull_request:
114
paths-ignore:
125
- "docs/**"
@@ -35,7 +28,7 @@ jobs:
3528
nf-test-changes:
3629
name: nf-test-changes
3730
runs-on: # use self-hosted runners
38-
- runs-on=$-nf-test-changes
31+
- runs-on=${{ github.run_id }}-nf-test-changes
3932
- runner=4cpu-linux-x64
4033
outputs:
4134
shard: ${{ steps.set-shards.outputs.shard }}
@@ -69,7 +62,7 @@ jobs:
6962
needs: [nf-test-changes]
7063
if: ${{ needs.nf-test-changes.outputs.total_shards != '0' }}
7164
runs-on: # use self-hosted runners
72-
- runs-on=$-nf-test
65+
- runs-on=${{ github.run_id }}-nf-test
7366
- runner=4cpu-linux-x64
7467
strategy:
7568
fail-fast: false
@@ -85,7 +78,7 @@ jobs:
8578
- isMain: false
8679
profile: "singularity"
8780
NXF_VER:
88-
- "24.04.2"
81+
- "24.10.5"
8982
- "latest-everything"
9083
env:
9184
NXF_ANSI_LOG: false
@@ -97,23 +90,39 @@ jobs:
9790
fetch-depth: 0
9891

9992
- name: Run nf-test
93+
id: run_nf_test
10094
uses: ./.github/actions/nf-test
95+
continue-on-error: ${{ matrix.NXF_VER == 'latest-everything' }}
10196
env:
102-
NFT_DIFF: ${{ env.NFT_DIFF }}
103-
NFT_DIFF_ARGS: ${{ env.NFT_DIFF_ARGS }}
10497
NFT_WORKDIR: ${{ env.NFT_WORKDIR }}
10598
with:
10699
profile: ${{ matrix.profile }}
107100
shard: ${{ matrix.shard }}
108101
total_shards: ${{ env.TOTAL_SHARDS }}
102+
103+
- name: Report test status
104+
if: ${{ always() }}
105+
run: |
106+
if [[ "${{ steps.run_nf_test.outcome }}" == "failure" ]]; then
107+
echo "::error::Test with ${{ matrix.NXF_VER }} failed"
108+
# Add to workflow summary
109+
echo "## ❌ Test failed: ${{ matrix.profile }} | ${{ matrix.NXF_VER }} | Shard ${{ matrix.shard }}/${{ env.TOTAL_SHARDS }}" >> $GITHUB_STEP_SUMMARY
110+
if [[ "${{ matrix.NXF_VER }}" == "latest-everything" ]]; then
111+
echo "::warning::Test with latest-everything failed but will not cause workflow failure. Please check if the error is expected or if it needs fixing."
112+
fi
113+
if [[ "${{ matrix.NXF_VER }}" != "latest-everything" ]]; then
114+
exit 1
115+
fi
116+
fi
117+
109118
confirm-pass:
110119
needs: [nf-test]
111120
if: always()
112121
runs-on: # use self-hosted runners
113-
- runs-on=$-confirm-pass
122+
- runs-on=${{ github.run_id }}-confirm-pass
114123
- runner=2cpu-linux-x64
115124
steps:
116-
- name: One or more tests failed
125+
- name: One or more tests failed (excluding latest-everything)
117126
if: ${{ contains(needs.*.result, 'failure') }}
118127
run: exit 1
119128

@@ -132,11 +141,3 @@ jobs:
132141
echo "DEBUG: toJSON(needs) = ${{ toJSON(needs) }}"
133142
echo "DEBUG: toJSON(needs.*.result) = ${{ toJSON(needs.*.result) }}"
134143
echo "::endgroup::"
135-
136-
- name: Clean Workspace # Purge the workspace in case it's running on a self-hosted runner
137-
if: always()
138-
run: |
139-
ls -la ./
140-
rm -rf ./* || true
141-
rm -rf ./.??* || true
142-
ls -la ./

.github/workflows/release-announcements.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
bsky-post:
3131
runs-on: ubuntu-latest
3232
steps:
33-
- uses: zentered/bluesky-post-action@4aa83560bb3eac05dbad1e5f221ee339118abdd2 # v0.2.0
33+
- uses: zentered/bluesky-post-action@6461056ea355ea43b977e149f7bf76aaa572e5e8 # v0.3.0
3434
with:
3535
post: |
3636
Pipeline release! ${{ github.repository }} v${{ github.event.release.tag_name }} - ${{ github.event.release.name }}!

.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.3.1
6+
nf_core_version: 3.3.2
77
repository_type: pipeline
88
template:
99
author: Espinosa-Carrasco J, Patel H, Wang C, Ewels P

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ repos:
44
hooks:
55
- id: prettier
66
additional_dependencies:
7-
- prettier@3.5.0
7+
- prettier@3.6.2
88
- repo: https://github.com/pre-commit/pre-commit-hooks
99
rev: v5.0.0
1010
hooks:

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
</picture>
66
</h1>
77

8-
[![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)
8+
[![GitHub Actions CI Status](https://github.com/nf-core/chipseq/actions/workflows/nf-test.yml/badge.svg)](https://github.com/nf-core/chipseq/actions/workflows/nf-test.yml)
99
[![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)
1010
[![nf-test](https://img.shields.io/badge/unit_tests-nf--test-337ab7.svg)](https://www.nf-test.com)
1111

12-
[![Nextflow](https://img.shields.io/badge/version-%E2%89%A524.04.2-green?style=flat&logo=nextflow&logoColor=white&color=%230DC09D&link=https%3A%2F%2Fnextflow.io)](https://www.nextflow.io/)
13-
[![nf-core template version](https://img.shields.io/badge/nf--core_template-3.3.1-green?style=flat&logo=nfcore&logoColor=white&color=%2324B064&link=https%3A%2F%2Fnf-co.re)](https://github.com/nf-core/tools/releases/tag/3.3.1)
12+
[![Nextflow](https://img.shields.io/badge/version-%E2%89%A524.10.5-green?style=flat&logo=nextflow&logoColor=white&color=%230DC09D&link=https%3A%2F%2Fnextflow.io)](https://www.nextflow.io/)
13+
[![nf-core template version](https://img.shields.io/badge/nf--core_template-3.3.2-green?style=flat&logo=nfcore&logoColor=white&color=%2324B064&link=https%3A%2F%2Fnf-co.re)](https://github.com/nf-core/tools/releases/tag/3.3.2)
1414
[![run with conda](http://img.shields.io/badge/run%20with-conda-3EB049?labelColor=000000&logo=anaconda)](https://docs.conda.io/en/latest/)
1515
[![run with docker](https://img.shields.io/badge/run%20with-docker-0db7ed?labelColor=000000&logo=docker)](https://www.docker.com/)
1616
[![run with singularity](https://img.shields.io/badge/run%20with-singularity-1d355c.svg?labelColor=000000)](https://sylabs.io/docs/)

assets/schema_input.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
"type": "string",
1818
"format": "file-path",
1919
"exists": true,
20-
"pattern": "^\\S+\\.f(ast)?q\\.gz$",
20+
"pattern": "^([\\S\\s]*\\/)?[^\\s\\/]+\\.f(ast)?q\\.gz$",
2121
"errorMessage": "FastQ file for reads 1 must be provided, cannot contain spaces and must have extension '.fq.gz' or '.fastq.gz'"
2222
},
2323
"fastq_2": {
2424
"type": "string",
2525
"format": "file-path",
2626
"exists": true,
27-
"pattern": "^\\S+\\.f(ast)?q\\.gz$",
27+
"pattern": "^([\\S\\s]*\\/)?[^\\s\\/]+\\.f(ast)?q\\.gz$",
2828
"errorMessage": "FastQ file for reads 2 cannot contain spaces and must have extension '.fq.gz' or '.fastq.gz'"
2929
}
3030
},

conf/base.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,6 @@ process {
6161
}
6262
withLabel: process_gpu {
6363
ext.use_gpu = { workflow.profile.contains('gpu') }
64+
accelerator = { workflow.profile.contains('gpu') ? 1 : null }
6465
}
6566
}

0 commit comments

Comments
 (0)