Skip to content

Commit ccfb140

Browse files
committed
Template update for nf-core/tools version 1.13.2
1 parent e9f315d commit ccfb140

File tree

6 files changed

+59
-4
lines changed

6 files changed

+59
-4
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
strategy:
2121
matrix:
2222
# Nextflow versions: check pipeline minimum and current latest
23-
nxf_ver: ['20.04.0', '']
23+
nxf_ver: ['20.04.0', '21.03.0-edge']
2424
steps:
2525
- name: Check out pipeline code
2626
uses: actions/checkout@v2

.github/workflows/linting.yml

Lines changed: 56 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,34 @@ jobs:
1919
run: npm install -g markdownlint-cli
2020
- name: Run Markdownlint
2121
run: markdownlint ${GITHUB_WORKSPACE} -c ${GITHUB_WORKSPACE}/.github/markdownlint.yml
22+
23+
# If the above check failed, post a comment on the PR explaining the failure
24+
- name: Post PR comment
25+
if: failure()
26+
uses: mshick/add-pr-comment@v1
27+
with:
28+
message: |
29+
## Markdown linting is failing
30+
31+
To keep the code consistent with lots of contributors, we run automated code consistency checks.
32+
To fix this CI test, please run:
33+
34+
* Install `markdownlint-cli`
35+
* On Mac: `brew install markdownlint-cli`
36+
* Everything else: [Install `npm`](https://www.npmjs.com/get-npm) then [install `markdownlint-cli`](https://www.npmjs.com/package/markdownlint-cli) (`npm install -g markdownlint-cli`)
37+
* Fix the markdown errors
38+
* Automatically: `markdownlint . --config .github/markdownlint.yml --fix`
39+
* Manually resolve anything left from `markdownlint . --config .github/markdownlint.yml`
40+
41+
Once you push these changes the test should pass, and you can hide this comment :+1:
42+
43+
We highly recommend setting up markdownlint in your code editor so that this formatting is done automatically on save. Ask about it on Slack for help!
44+
45+
Thanks again for your contribution!
46+
repo-token: ${{ secrets.GITHUB_TOKEN }}
47+
allow-repeats: false
48+
49+
2250
YAML:
2351
runs-on: ubuntu-latest
2452
steps:
@@ -29,7 +57,34 @@ jobs:
2957
- name: Install yaml-lint
3058
run: npm install -g yaml-lint
3159
- name: Run yaml-lint
32-
run: yamllint $(find ${GITHUB_WORKSPACE} -type f -name "*.yml")
60+
run: yamllint $(find ${GITHUB_WORKSPACE} -type f -name "*.yml" -o -name "*.yaml")
61+
62+
# If the above check failed, post a comment on the PR explaining the failure
63+
- name: Post PR comment
64+
if: failure()
65+
uses: mshick/add-pr-comment@v1
66+
with:
67+
message: |
68+
## YAML linting is failing
69+
70+
To keep the code consistent with lots of contributors, we run automated code consistency checks.
71+
To fix this CI test, please run:
72+
73+
* Install `yaml-lint`
74+
* [Install `npm`](https://www.npmjs.com/get-npm) then [install `yaml-lint`](https://www.npmjs.com/package/yaml-lint) (`npm install -g yaml-lint`)
75+
* Fix the markdown errors
76+
* Run the test locally: `yamllint $(find . -type f -name "*.yml" -o -name "*.yaml")`
77+
* Fix any reported errors in your YAML files
78+
79+
Once you push these changes the test should pass, and you can hide this comment :+1:
80+
81+
We highly recommend setting up yaml-lint in your code editor so that this formatting is done automatically on save. Ask about it on Slack for help!
82+
83+
Thanks again for your contribution!
84+
repo-token: ${{ secrets.GITHUB_TOKEN }}
85+
allow-repeats: false
86+
87+
3388
nf-core:
3489
runs-on: ubuntu-latest
3590
steps:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM nfcore/base:1.13.1
1+
FROM nfcore/base:1.13.2
22
LABEL authors="Phil Ewels, Rickard Hammarén" \
33
description="Docker image containing all software requirements for the nf-core/rnaseq pipeline"
44

bin/markdown_to_html.py

100644100755
File mode changed.

bin/scrape_software_versions.py

100644100755
File mode changed.

lib/NfcoreSchema.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ class NfcoreSchema {
219219
}
220220
}
221221
}
222-
if(rawSchema.keySet().contains('properties') && rawSchema.get('properties').containsKey(ignore_param)) {
222+
if(rawSchema.keySet().contains('properties') && rawSchema.get('properties').keySet().contains(ignore_param)) {
223223
rawSchema.get("properties").remove(ignore_param)
224224
}
225225
if(rawSchema.keySet().contains('required') && rawSchema.required.contains(ignore_param)) {

0 commit comments

Comments
 (0)