Skip to content

Commit 31eb63e

Browse files
authored
Merge pull request #199 from nf-core/nf-core-template-merge-3.3.2
Important! Template update for nf-core/tools v3.3.2
2 parents 22f6c84 + fe971ee commit 31eb63e

File tree

19 files changed

+133
-239
lines changed

19 files changed

+133
-239
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: 20 additions & 137 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
name: Run nf-test
22
on:
3-
push:
4-
branches:
5-
- dev
6-
- master
7-
- main
8-
paths-ignore:
9-
- "docs/**"
10-
- "**/meta.yml"
11-
- "**/*.md"
12-
- "**/*.png"
13-
- "**/*.svg"
143
pull_request:
154
paths-ignore:
165
- "docs/**"
@@ -39,8 +28,9 @@ jobs:
3928
nf-test-changes:
4029
name: nf-test-changes
4130
runs-on: # use self-hosted runners
42-
- runs-on=$-nf-test-changes
31+
- runs-on=${{ github.run_id }}-nf-test-changes
4332
- runner=4cpu-linux-x64
33+
- disk=large
4434
outputs:
4535
shard: ${{ steps.set-shards.outputs.shard }}
4636
total_shards: ${{ steps.set-shards.outputs.total_shards }}
@@ -74,7 +64,7 @@ jobs:
7464
needs: [nf-test-changes]
7565
if: ${{ needs.nf-test-changes.outputs.total_shards != '0' }}
7666
runs-on: # use self-hosted runners
77-
- runs-on=$-nf-test
67+
- runs-on=${{ github.run_id }}-nf-test
7868
- runner=4cpu-linux-x64
7969
- disk=large
8070
strategy:
@@ -91,7 +81,7 @@ jobs:
9181
- isMain: false
9282
profile: "singularity"
9383
NXF_VER:
94-
- "24.04.2"
84+
- "24.10.5"
9585
- "latest-everything"
9686
env:
9787
NXF_ANSI_LOG: false
@@ -103,138 +93,39 @@ jobs:
10393
fetch-depth: 0
10494

10595
- name: Run nf-test
96+
id: run_nf_test
10697
uses: ./.github/actions/nf-test
98+
continue-on-error: ${{ matrix.NXF_VER == 'latest-everything' }}
10799
env:
108100
NFT_WORKDIR: ${{ env.NFT_WORKDIR }}
109101
with:
110102
profile: ${{ matrix.profile }}
111103
shard: ${{ matrix.shard }}
112104
total_shards: ${{ env.TOTAL_SHARDS }}
113-
tags: modules_local,subworkflows_local
114-
115-
pipeline-tests:
116-
name: "Pipeline Test | ${{ matrix.test_name }} | ${{ matrix.NXF_VER }} | ${{ matrix.profile }}"
117-
runs-on: ubuntu-latest
118-
strategy:
119-
fail-fast: false
120-
matrix:
121-
test_name:
122-
- "default"
123-
- "main_pipeline_build"
124-
- "main_pipeline_extend"
125-
- "main_pipeline_sub"
126-
- "main_pipeline_qc"
127-
- "main_pipeline_reference_mapping"
128-
profile: [conda, docker, singularity]
129-
isMain:
130-
- ${{ github.base_ref == 'master' || github.base_ref == 'main' }}
131-
# Exclude conda and singularity on dev
132-
exclude:
133-
- isMain: false
134-
profile: "conda"
135-
- isMain: false
136-
profile: "singularity"
137-
NXF_VER:
138-
- "24.04.2"
139-
- "latest-everything"
140-
steps:
141-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
142-
with:
143-
fetch-depth: 0
144-
145-
- name: Disk space cleanup
146-
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
147105

148-
- name: Setup Nextflow
149-
uses: nf-core/setup-nextflow@v2
150-
with:
151-
version: "${{ matrix.NXF_VER }}"
152-
153-
- name: Set up Python
154-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
155-
with:
156-
python-version: "3.13"
157-
158-
- name: Install nf-test
159-
uses: nf-core/setup-nf-test@v1
160-
with:
161-
version: ${{ env.NFT_VER }}
162-
install-pdiff: true
163-
164-
- name: Setup apptainer
165-
if: contains(matrix.profile, 'singularity')
166-
uses: eWaterCycle/setup-apptainer@main
167-
168-
- name: Set up Singularity
169-
if: contains(matrix.profile, 'singularity')
170-
shell: bash
171-
run: |
172-
mkdir -p $NXF_SINGULARITY_CACHEDIR
173-
mkdir -p $NXF_SINGULARITY_LIBRARYDIR
174-
175-
- name: Conda setup
176-
if: contains(matrix.profile, 'conda')
177-
uses: conda-incubator/setup-miniconda@505e6394dae86d6a5c7fbb6e3fb8938e3e863830 # v3
178-
with:
179-
auto-update-conda: true
180-
conda-solver: libmamba
181-
conda-remove-defaults: true
182-
183-
- name: Run nf-test
184-
shell: bash
185-
env:
186-
NFT_DIFF: ${{ env.NFT_DIFF }}
187-
NFT_DIFF_ARGS: ${{ env.NFT_DIFF_ARGS }}
188-
NFT_WORKDIR: ${{ env.NFT_WORKDIR }}
106+
- name: Report test status
107+
if: ${{ always() }}
189108
run: |
190-
# Make it clear that we're ONLY running tests from the tests directory
191-
# and not including any module or subworkflow tests
192-
nf-test test \
193-
--profile=+${{ matrix.profile }} \
194-
--ci \
195-
--verbose \
196-
--tap=test.tap \
197-
tests/${{ matrix.test_name }}.nf.test
198-
199-
- name: Generate test summary
200-
if: always()
201-
shell: bash
202-
run: |
203-
# Add header if it doesn't exist (using a token file to track this)
204-
if [ ! -f ".summary_header" ]; then
205-
echo "# 🚀 nf-test results" >> $GITHUB_STEP_SUMMARY
206-
echo "" >> $GITHUB_STEP_SUMMARY
207-
echo "| Status | Test Name | Profile | Nextflow Version |" >> $GITHUB_STEP_SUMMARY
208-
echo "|:------:|-----------|---------|-----------------|" >> $GITHUB_STEP_SUMMARY
209-
touch .summary_header
210-
fi
211-
212-
if [ -f test.tap ]; then
213-
while IFS= read -r line; do
214-
if [[ $line =~ ^ok ]]; then
215-
test_name="${line#ok }"
216-
# Remove the test number from the beginning
217-
test_name="${test_name#* }"
218-
echo "| ✅ | ${test_name} | ${{ matrix.profile }} | ${{ matrix.NXF_VER }} |" >> $GITHUB_STEP_SUMMARY
219-
elif [[ $line =~ ^not\ ok ]]; then
220-
test_name="${line#not ok }"
221-
# Remove the test number from the beginning
222-
test_name="${test_name#* }"
223-
echo "| ❌ | ${test_name} | ${{ matrix.profile }} | ${{ matrix.NXF_VER }} |" >> $GITHUB_STEP_SUMMARY
224-
fi
225-
done < test.tap
226-
else
227-
echo "| ⚠️ | No test results found | ${{ matrix.profile }} | ${{ matrix.NXF_VER }} |" >> $GITHUB_STEP_SUMMARY
109+
if [[ "${{ steps.run_nf_test.outcome }}" == "failure" ]]; then
110+
echo "::error::Test with ${{ matrix.NXF_VER }} failed"
111+
# Add to workflow summary
112+
echo "## ❌ Test failed: ${{ matrix.profile }} | ${{ matrix.NXF_VER }} | Shard ${{ matrix.shard }}/${{ env.TOTAL_SHARDS }}" >> $GITHUB_STEP_SUMMARY
113+
if [[ "${{ matrix.NXF_VER }}" == "latest-everything" ]]; then
114+
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."
115+
fi
116+
if [[ "${{ matrix.NXF_VER }}" != "latest-everything" ]]; then
117+
exit 1
118+
fi
228119
fi
229120
230121
confirm-pass:
231122
needs: [nf-test, pipeline-tests]
232123
if: always()
233124
runs-on: # use self-hosted runners
234-
- runs-on=$-confirm-pass
125+
- runs-on=${{ github.run_id }}-confirm-pass
235126
- runner=2cpu-linux-x64
236127
steps:
237-
- name: One or more tests failed
128+
- name: One or more tests failed (excluding latest-everything)
238129
if: ${{ contains(needs.*.result, 'failure') }}
239130
run: exit 1
240131

@@ -253,11 +144,3 @@ jobs:
253144
echo "DEBUG: toJSON(needs) = ${{ toJSON(needs) }}"
254145
echo "DEBUG: toJSON(needs.*.result) = ${{ toJSON(needs.*.result) }}"
255146
echo "::endgroup::"
256-
257-
- name: Clean Workspace # Purge the workspace in case it's running on a self-hosted runner
258-
if: always()
259-
run: |
260-
ls -la ./
261-
rm -rf ./* || true
262-
rm -rf ./.??* || true
263-
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
@@ -1,4 +1,4 @@
1-
nf_core_version: 3.3.1
1+
nf_core_version: 3.3.2
22
repository_type: pipeline
33
template:
44
author: Nico Trummer

.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: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@
55
</picture>
66
</h1>
77

8-
[![GitHub Actions CI Status](https://github.com/nf-core/scdownstream/actions/workflows/ci.yml/badge.svg)](https://github.com/nf-core/scdownstream/actions/workflows/ci.yml)
9-
[![GitHub Actions Linting Status](https://github.com/nf-core/scdownstream/actions/workflows/linting.yml/badge.svg)](https://github.com/nf-core/scdownstream/actions/workflows/linting.yml)
10-
[![AWS CI](https://img.shields.io/badge/CI%20tests-full%20size-FF9900?labelColor=000000&logo=Amazon%20AWS)](https://nf-co.re/scdownstream/results)
11-
[![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.XXXXXXX-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.XXXXXXX)
8+
[![GitHub Actions CI Status](https://github.com/nf-core/scdownstream/actions/workflows/nf-test.yml/badge.svg)](https://github.com/nf-core/scdownstream/actions/workflows/nf-test.yml)
9+
[![GitHub Actions Linting Status](https://github.com/nf-core/scdownstream/actions/workflows/linting.yml/badge.svg)](https://github.com/nf-core/scdownstream/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/scdownstream/results)[![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.XXXXXXX-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.XXXXXXX)
1210
[![nf-test](https://img.shields.io/badge/unit_tests-nf--test-337ab7.svg)](https://www.nf-test.com)
1311

14-
[![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/)
15-
[![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)
1614
[![run with conda](http://img.shields.io/badge/run%20with-conda-3EB049?labelColor=000000&logo=anaconda)](https://docs.conda.io/en/latest/)
1715
[![run with docker](https://img.shields.io/badge/run%20with-docker-0db7ed?labelColor=000000&logo=docker)](https://www.docker.com/)
1816
[![run with singularity](https://img.shields.io/badge/run%20with-singularity-1d355c.svg?labelColor=000000)](https://sylabs.io/docs/)

modules.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
},
3333
"multiqc": {
3434
"branch": "master",
35-
"git_sha": "7b50cb7be890e4b28cffb82e438cc6a8d7805d3f",
35+
"git_sha": "c9a31c472ef2d86802eb44f27322955849859361",
3636
"installed_by": ["modules"]
3737
},
3838
"scvitools/scar": {

modules/nf-core/multiqc/environment.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)