Skip to content

Commit bc3ddce

Browse files
authored
Merge branch 'dev' into nf-core-template-merge-3.2.0
2 parents d6120ed + 5327c13 commit bc3ddce

File tree

195 files changed

+13449
-1082
lines changed

Some content is hidden

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

195 files changed

+13449
-1082
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ trim_trailing_whitespace = true
88
indent_size = 4
99
indent_style = space
1010

11-
[*.{md,yml,yaml,html,css,scss,js}]
11+
[*.{md,yml,yaml,html,css,scss,js,cff}]
1212
indent_size = 2
1313

1414
# These files are edited and tested upstream in nf-core/modules

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@ name: Bug report
22
description: Report something that is broken or incorrect
33
labels: bug
44
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
Before you post this issue, please check the documentation:
9+
10+
- [nf-core website: troubleshooting](https://nf-co.re/usage/troubleshooting)
11+
- [sanger-tol/blobtoolkit pipeline documentation](https://pipelines.tol.sanger.ac.uk/blobtoolkit/usage)
12+
513
- type: textarea
614
id: description
715
attributes:

.github/workflows/ci.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,24 @@ concurrency:
2121
jobs:
2222
test:
2323
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)
24+
# Only run on push if this is the dev branch (merged PRs)
2525
if: "${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'sanger-tol/blobtoolkit') }}"
2626
runs-on: ubuntu-latest
2727
strategy:
2828
matrix:
2929
NXF_VER:
3030
- "24.04.2"
3131
- "latest-everything"
32+
# "conda" is not supported
3233
profile:
33-
- "conda"
3434
- "docker"
3535
- "singularity"
3636
test_name:
3737
- "test"
3838
isMaster:
39-
- ${{ github.base_ref == 'master' }}
39+
- ${{ github.base_ref == 'main' }}
4040
# Exclude conda and singularity on dev
4141
exclude:
42-
- isMaster: false
43-
profile: "conda"
4442
- isMaster: false
4543
profile: "singularity"
4644
steps:

.github/workflows/fix-linting.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ jobs:
88
# Only run if comment is on a PR with the main repo, and if it contains the magic keywords
99
if: >
1010
contains(github.event.comment.html_url, '/pull/') &&
11-
contains(github.event.comment.body, '@nf-core-bot fix linting') &&
11+
contains(github.event.comment.body, '@sanger-tolsoft fix linting') &&
1212
github.repository == 'sanger-tol/blobtoolkit'
1313
runs-on: ubuntu-latest
1414
steps:
15-
# Use the @nf-core-bot token to check out so we can push later
15+
# Use the @sanger-tolsoft token to check out so we can push later
1616
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
1717
with:
18-
token: ${{ secrets.nf_core_bot_auth_token }}
18+
token: ${{ secrets.sangertolsoft_access_token }}
1919

2020
# indication that the linting is being fixed
2121
- name: React on comment
@@ -29,7 +29,7 @@ jobs:
2929
- name: Checkout Pull Request
3030
run: gh pr checkout ${{ github.event.issue.number }}
3131
env:
32-
GITHUB_TOKEN: ${{ secrets.nf_core_bot_auth_token }}
32+
GITHUB_TOKEN: ${{ secrets.sangertolsoft_access_token }}
3333

3434
# Install and run pre-commit
3535
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
@@ -56,8 +56,8 @@ jobs:
5656
id: commit-and-push
5757
if: steps.pre-commit.outcome == 'failure'
5858
run: |
59-
git config user.email "core@nf-co.re"
60-
git config user.name "nf-core-bot"
59+
git config user.email "105875386+sanger-tolsoft@users.noreply.github.com"
60+
git config user.name "sanger-tolsoft"
6161
git config push.default upstream
6262
git add .
6363
git status

.github/workflows/sanger_test.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: sanger-tol LSF tests
2+
3+
on:
4+
workflow_dispatch:
5+
jobs:
6+
run-tower:
7+
name: Run LSF tests
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Sets env vars for workflow_dispatch
11+
run: |
12+
echo "REVISION=${{ github.sha }}" >> $GITHUB_ENV
13+
if: github.event_name == 'workflow_dispatch'
14+
15+
- name: Launch workflow via tower
16+
uses: seqeralabs/action-tower-launch@v2
17+
with:
18+
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
19+
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
20+
compute_env: ${{ secrets.TOWER_COMPUTE_ENV_LARGE }}
21+
revision: ${{ env.REVISION }}
22+
workdir: ${{ secrets.TOWER_WORKDIR_PARENT }}/work/${{ github.repository }}/work-${{ env.REVISION }}
23+
parameters: |
24+
{
25+
"outdir": "${{ secrets.TOWER_WORKDIR_PARENT }}/results/${{ github.repository }}/results-${{ env.REVISION }}",
26+
"use_work_dir_as_temp": true,
27+
}
28+
profiles: test,sanger,singularity,cleanup
29+
- uses: actions/upload-artifact@v4
30+
with:
31+
name: Tower debug log file
32+
path: |
33+
tower_action_*.log
34+
tower_action_*.json
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: sanger-tol LSF full size tests
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- dev
8+
workflow_dispatch:
9+
jobs:
10+
run-tower:
11+
name: Run LSF full size tests
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Sets env vars for push
15+
run: |
16+
echo "REVISION=${{ github.sha }}" >> $GITHUB_ENV
17+
if: github.event_name == 'push'
18+
19+
- name: Sets env vars for workflow_dispatch
20+
run: |
21+
echo "REVISION=${{ github.sha }}" >> $GITHUB_ENV
22+
if: github.event_name == 'workflow_dispatch'
23+
24+
- name: Launch workflow via tower
25+
uses: seqeralabs/action-tower-launch@v2
26+
with:
27+
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
28+
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
29+
compute_env: ${{ secrets.TOWER_COMPUTE_ENV }}
30+
revision: ${{ env.REVISION }}
31+
workdir: ${{ secrets.TOWER_WORKDIR_PARENT }}/work/${{ github.repository }}/work-${{ env.REVISION }}
32+
parameters: |
33+
{
34+
"outdir": "${{ secrets.TOWER_WORKDIR_PARENT }}/results/${{ github.repository }}/results-${{ env.REVISION }}",
35+
}
36+
profiles: test_full,sanger,singularity,cleanup
37+
- uses: actions/upload-artifact@v4
38+
with:
39+
name: Tower debug log file
40+
path: |
41+
tower_action_*.log
42+
tower_action_*.json

0 commit comments

Comments
 (0)