Skip to content

Commit 67ba99e

Browse files
committed
Merged changes from nf-core template
2 parents a21f43e + 5f942c8 commit 67ba99e

23 files changed

Lines changed: 144 additions & 121 deletions

.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 }}
@@ -70,7 +63,7 @@ jobs:
7063
needs: [nf-test-changes]
7164
if: ${{ needs.nf-test-changes.outputs.total_shards != '0' }}
7265
runs-on: # use self-hosted runners
73-
- runs-on=$-nf-test
66+
- runs-on=${{ github.run_id }}-nf-test
7467
- runner=4cpu-linux-x64
7568
strategy:
7669
fail-fast: false
@@ -86,7 +79,7 @@ jobs:
8679
- isMain: false
8780
profile: "singularity"
8881
NXF_VER:
89-
- "24.04.2"
82+
- "24.10.5"
9083
- "latest-everything"
9184
env:
9285
NXF_ANSI_LOG: false
@@ -98,23 +91,39 @@ jobs:
9891
fetch-depth: 0
9992

10093
- name: Run nf-test
94+
id: run_nf_test
10195
uses: ./.github/actions/nf-test
96+
continue-on-error: ${{ matrix.NXF_VER == 'latest-everything' }}
10297
env:
103-
NFT_DIFF: ${{ env.NFT_DIFF }}
104-
NFT_DIFF_ARGS: ${{ env.NFT_DIFF_ARGS }}
10598
NFT_WORKDIR: ${{ env.NFT_WORKDIR }}
10699
with:
107100
profile: ${{ matrix.profile }}
108101
shard: ${{ matrix.shard }}
109102
total_shards: ${{ env.TOTAL_SHARDS }}
103+
104+
- name: Report test status
105+
if: ${{ always() }}
106+
run: |
107+
if [[ "${{ steps.run_nf_test.outcome }}" == "failure" ]]; then
108+
echo "::error::Test with ${{ matrix.NXF_VER }} failed"
109+
# Add to workflow summary
110+
echo "## ❌ Test failed: ${{ matrix.profile }} | ${{ matrix.NXF_VER }} | Shard ${{ matrix.shard }}/${{ env.TOTAL_SHARDS }}" >> $GITHUB_STEP_SUMMARY
111+
if [[ "${{ matrix.NXF_VER }}" == "latest-everything" ]]; then
112+
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."
113+
fi
114+
if [[ "${{ matrix.NXF_VER }}" != "latest-everything" ]]; then
115+
exit 1
116+
fi
117+
fi
118+
110119
confirm-pass:
111120
needs: [nf-test]
112121
if: always()
113122
runs-on: # use self-hosted runners
114-
- runs-on=$-confirm-pass
123+
- runs-on=${{ github.run_id }}-confirm-pass
115124
- runner=2cpu-linux-x64
116125
steps:
117-
- name: One or more tests failed
126+
- name: One or more tests failed (excluding latest-everything)
118127
if: ${{ contains(needs.*.result, 'failure') }}
119128
run: exit 1
120129

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

.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/lsmquant/actions/workflows/ci.yml/badge.svg)](https://github.com/nf-core/lsmquant/actions/workflows/ci.yml)
8+
[![GitHub Actions CI Status](https://github.com/nf-core/lsmquant/actions/workflows/nf-test.yml/badge.svg)](https://github.com/nf-core/lsmquant/actions/workflows/nf-test.yml)
99
[![GitHub Actions Linting Status](https://github.com/nf-core/lsmquant/actions/workflows/linting.yml/badge.svg)](https://github.com/nf-core/lsmquant/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/lsmquant/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/)

conf/base.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,6 @@ process {
6868
}
6969
withLabel: process_gpu {
7070
ext.use_gpu = { workflow.profile.contains('gpu') }
71+
accelerator = { workflow.profile.contains('gpu') ? 1 : null }
7172
}
7273
}

modules.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
},
1313
"fastqc": {
1414
"branch": "master",
15-
"git_sha": "08108058ea36a63f141c25c4e75f9f872a5b2296",
15+
"git_sha": "41dfa3f7c0ffabb96a6a813fe321c6d1cc5b6e46",
1616
"installed_by": ["modules"]
1717
},
1818
"multiqc": {
1919
"branch": "master",
20-
"git_sha": "f0719ae309075ae4a291533883847c3f7c441dad",
20+
"git_sha": "41dfa3f7c0ffabb96a6a813fe321c6d1cc5b6e46",
2121
"installed_by": ["modules"]
2222
},
2323
"unzip": {

0 commit comments

Comments
 (0)