Skip to content

Commit 94f2c38

Browse files
committed
Merge branch 'dev' into nf-core-template-merge-3.0.2
2 parents a044cd3 + ea70b71 commit 94f2c38

File tree

541 files changed

+96105
-484
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

541 files changed

+96105
-484
lines changed

.github/include.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
".":
2+
- ./.github/workflows/**
3+
- ./nf-test.config
4+
- ./nextflow.config
5+
tests:
6+
- ./assets/*
7+
- ./bin/*
8+
- ./conf/*
9+
- ./main.nf
10+
- ./nextflow_schema.json

.github/workflows/awsfulltest.yml

Lines changed: 0 additions & 56 deletions
This file was deleted.

.github/workflows/awstest.yml

Lines changed: 0 additions & 33 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 83 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,53 @@
11
name: nf-core CI
22
# This workflow runs the pipeline with the minimal test dataset to check that it completes without any syntax errors
33
on:
4-
push:
5-
branches:
6-
- dev
74
pull_request:
85
release:
96
types: [published]
107
workflow_dispatch:
118

129
env:
10+
NFT_DIFF: "pdiff"
11+
NFT_DIFF_ARGS: "--line-numbers --width 120 --expand-tabs=2"
12+
NFT_VER: "0.9.0"
13+
NFT_WORKDIR: "~"
1314
NXF_ANSI_LOG: false
1415
NXF_SINGULARITY_CACHEDIR: ${{ github.workspace }}/.singularity
1516
NXF_SINGULARITY_LIBRARYDIR: ${{ github.workspace }}/.singularity
1617

1718
concurrency:
1819
group: "${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}"
1920
cancel-in-progress: true
20-
2121
jobs:
22+
nf-test-changes:
23+
name: Check for changes
24+
runs-on: ubuntu-latest
25+
outputs:
26+
nf_test_files: ${{ steps.list.outputs.components }}
27+
steps:
28+
- uses: actions/checkout@v4
29+
with:
30+
fetch-depth: 0
31+
32+
- name: List nf-test files
33+
id: list
34+
uses: adamrtalbot/[email protected]
35+
with:
36+
head: ${{ github.sha }}
37+
base: origin/${{ github.base_ref }}
38+
include: .github/include.yaml
39+
40+
- name: print list of nf-test files
41+
run: |
42+
echo ${{ steps.list.outputs.components }}
43+
2244
test:
23-
name: "Run pipeline with test data (${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }})"
24-
# Only run on push if this is the nf-core dev branch (merged PRs)
25-
if: "${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/rnaseq') }}"
45+
name: "Run tests (${{ matrix.nf_test_files }} ${{ matrix.profile }} NF-${{ matrix.NXF_VER }})"
46+
needs: [nf-test-changes]
47+
if: needs.nf-test-changes.outputs.nf_test_files != '[]'
2648
runs-on: ubuntu-latest
2749
strategy:
50+
fail-fast: false
2851
matrix:
2952
NXF_VER:
3053
- "24.04.2"
@@ -83,3 +106,56 @@ jobs:
83106
- name: "Run pipeline with test data ${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }}"
84107
run: |
85108
nextflow run ${GITHUB_WORKSPACE} -profile ${{ matrix.test_name }},${{ matrix.profile }} --outdir ./results
109+
- name: Install nf-test
110+
uses: nf-core/setup-nf-test@v1
111+
with:
112+
version: ${{ env.NFT_VER }}
113+
114+
- uses: actions/setup-python@v4
115+
with:
116+
python-version: "3.11"
117+
architecture: "x64"
118+
119+
- name: Install pdiff to see diff between nf-test snapshots
120+
run: |
121+
python -m pip install --upgrade pip
122+
pip install pdiff
123+
124+
- name: Run nf-test
125+
run: |
126+
nf-test test --verbose ${{ matrix.nf_test_files }} --profile "+${{ matrix.profile }}" --junitxml=test.xml --tap=test.tap
127+
128+
- uses: pcolby/tap-summary@v1
129+
with:
130+
path: >-
131+
test.tap
132+
133+
- name: Output log on failure
134+
if: failure()
135+
run: |
136+
sudo apt install bat > /dev/null
137+
batcat --decorations=always --color=always ${{ github.workspace }}/.nf-test/tests/*/meta/nextflow.log
138+
139+
- name: Publish Test Report
140+
uses: mikepenz/action-junit-report@v3
141+
if: always() # always run even if the previous step fails
142+
with:
143+
report_paths: test.xml
144+
145+
confirm-pass:
146+
runs-on: ubuntu-latest
147+
needs: [test]
148+
if: always()
149+
steps:
150+
- name: All tests ok
151+
if: ${{ !contains(needs.*.result, 'failure') }}
152+
run: exit 0
153+
- name: One or more tests failed
154+
if: ${{ contains(needs.*.result, 'failure') }}
155+
run: exit 1
156+
157+
- name: debug-print
158+
if: always()
159+
run: |
160+
echo "toJSON(needs) = ${{ toJSON(needs) }}"
161+
echo "toJSON(needs.*.result) = ${{ toJSON(needs.*.result) }}"
Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
name: full-sized tests on cloud providers
2+
run-name: Submitting workflow to all cloud providers using full sized data
3+
on:
4+
release:
5+
types: [published]
6+
workflow_dispatch:
7+
inputs:
8+
platform:
9+
description: "Platform to run test"
10+
required: true
11+
default: "all"
12+
type: choice
13+
options:
14+
- all
15+
- aws
16+
- azure
17+
- gcp
18+
jobs:
19+
run-full-tests-on-aws:
20+
if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'aws' || !github.event.inputs }}
21+
runs-on: ubuntu-latest
22+
strategy:
23+
matrix:
24+
aligner: ["star_salmon", "star_rsem"]
25+
steps:
26+
- uses: seqeralabs/action-tower-launch@v2
27+
with:
28+
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
29+
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
30+
compute_env: ${{ secrets.TOWER_CE_AWS_CPU }}
31+
workdir: "${{ secrets.TOWER_BUCKET_AWS }}/work/rnaseq/work-${{ github.sha }}"
32+
run_name: "aws_rnaseq_full_${{ matrix.aligner }}"
33+
revision: ${{ github.sha }}
34+
profiles: test_full_aws
35+
parameters: |
36+
{
37+
"hook_url": "${{ secrets.MEGATESTS_ALERTS_SLACK_HOOK_URL }}",
38+
"aligner": "${{ matrix.aligner }}",
39+
"outdir": "${{ secrets.TOWER_BUCKET_AWS }}/rnaseq/results-${{ github.sha }}/aligner_${{ matrix.aligner }}/"
40+
}
41+
- uses: actions/upload-artifact@v3
42+
with:
43+
name: Tower debug log file
44+
path: tower_action_*.log
45+
46+
run-full-tests-on-azure:
47+
if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'azure' || !github.event.inputs }}
48+
runs-on: ubuntu-latest
49+
strategy:
50+
matrix:
51+
aligner: ["star_salmon", "star_rsem"]
52+
steps:
53+
- uses: seqeralabs/action-tower-launch@v2
54+
with:
55+
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
56+
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
57+
compute_env: ${{ secrets.TOWER_CE_AZURE_CPU }}
58+
workdir: "${{ secrets.TOWER_BUCKET_AZURE }}/work/rnaseq/work-${{ github.sha }}"
59+
run_name: "azure_rnaseq_full_${{ matrix.aligner }}"
60+
revision: ${{ github.sha }}
61+
profiles: test_full_azure
62+
parameters: |
63+
{
64+
"hook_url": "${{ secrets.MEGATESTS_ALERTS_SLACK_HOOK_URL }}",
65+
"aligner": "${{ matrix.aligner }}",
66+
"outdir": "${{ secrets.TOWER_BUCKET_AZURE }}/rnaseq/results-${{ github.sha }}/aligner_${{ matrix.aligner }}/",
67+
"igenomes_base": "${{ secrets.TOWER_IGENOMES_BASE_AZURE }}"
68+
}
69+
- uses: actions/upload-artifact@v3
70+
with:
71+
name: Tower debug log file
72+
path: tower_action_*.log
73+
74+
run-full-tests-on-gcp:
75+
if: ${{ github.event.inputs.platform == 'gcp' || !github.event.inputs }}
76+
runs-on: ubuntu-latest
77+
strategy:
78+
matrix:
79+
aligner: ["star_salmon", "star_rsem"]
80+
steps:
81+
- uses: seqeralabs/action-tower-launch@v2
82+
with:
83+
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
84+
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
85+
compute_env: ${{ secrets.TOWER_CE_GCP_CPU }}
86+
workdir: "${{ secrets.TOWER_BUCKET_GCP }}/work/rnaseq/work-${{ github.sha }}"
87+
run_name: "gcp_rnaseq_full_${{ matrix.aligner }}"
88+
revision: ${{ github.sha }}
89+
profiles: test_full_gcp
90+
parameters: |
91+
{
92+
"hook_url": "${{ secrets.MEGATESTS_ALERTS_SLACK_HOOK_URL }}",
93+
"aligner": "${{ matrix.aligner }}",
94+
"outdir": "${{ secrets.TOWER_BUCKET_GCP }}/rnaseq/results-${{ github.sha }}/aligner_${{ matrix.aligner }}/"
95+
}
96+
- uses: actions/upload-artifact@v3
97+
with:
98+
name: Tower debug log file
99+
path: tower_action_*.log

0 commit comments

Comments
 (0)