Skip to content

Commit

Permalink
Merge pull request nf-core#354 from Emiller88/prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
ewels authored Mar 23, 2022
2 parents 962d86d + 590045b commit 2c18f8c
Show file tree
Hide file tree
Showing 50 changed files with 383 additions and 363 deletions.
12 changes: 12 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
indent_size = 4
indent_style = space

[*.{md,yml,yaml}]
indent_size = 2
17 changes: 9 additions & 8 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,17 @@ about: A new cluster config

Please follow these steps before submitting your PR:

* [ ] If your PR is a work in progress, include `[WIP]` in its title
* [ ] Your PR targets the `master` branch
* [ ] You've included links to relevant issues, if any
- [ ] If your PR is a work in progress, include `[WIP]` in its title
- [ ] Your PR targets the `master` branch
- [ ] You've included links to relevant issues, if any

Steps for adding a new config profile:
* [ ] Add your custom config file to the `conf/` directory
* [ ] Add your documentation file to the `docs/` directory
* [ ] Add your custom profile to the `nfcore_custom.config` file in the top-level directory
* [ ] Add your custom profile to the `README.md` file in the top-level directory
* [ ] Add your profile name to the `profile:` scope in `.github/workflows/main.yml`

- [ ] Add your custom config file to the `conf/` directory
- [ ] Add your documentation file to the `docs/` directory
- [ ] Add your custom profile to the `nfcore_custom.config` file in the top-level directory
- [ ] Add your custom profile to the `README.md` file in the top-level directory
- [ ] Add your profile name to the `profile:` scope in `.github/workflows/main.yml`

<!--
If you require/still waiting for a review, please feel free to request from @nf-core/configs-team
Expand Down
5 changes: 0 additions & 5 deletions .github/markdownlint.yml

This file was deleted.

32 changes: 18 additions & 14 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
name: Markdown linting
# This workflow is triggered on pushes and PRs to the repository.
on: [push, pull_request]
name: Code Linting
on:
pull_request:
push:
branches:
- master

jobs:
Markdown:
runs-on: ubuntu-18.04
prettier:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v2
- name: Install markdownlint
run: |
npm install -g markdownlint-cli
- name: Run Markdownlint
run: |
markdownlint ${GITHUB_WORKSPACE} -c ${GITHUB_WORKSPACE}/.github/markdownlint.yml
- name: Check out repository
uses: actions/checkout@v2

- name: Install NodeJS
uses: actions/setup-node@v2

- name: Install Prettier
run: npm install -g prettier

- name: Run Prettier --check
run: prettier --check ${GITHUB_WORKSPACE}
119 changes: 59 additions & 60 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: Configs tests
on: [pull_request, push]

jobs:

test_all_profiles:
runs-on: ubuntu-latest
name: Check if all profiles are tested
Expand All @@ -28,64 +27,64 @@ jobs:
name: Run ${{ matrix.profile }} profile
needs: test_all_profiles
strategy:
matrix:
profile:
- 'abims'
- 'alice'
- 'aws_tower'
- 'awsbatch'
- 'azurebatch'
- 'bi'
- 'bigpurple'
- 'binac'
- 'biohpc_gen'
- 'cambridge'
- 'leicester'
- 'cbe'
- 'ccga_dx'
- 'ccga_med'
- 'cfc'
- 'cfc_dev'
- 'cheaha'
- 'computerome'
- 'crick'
- 'denbi_qbic'
- 'ebc'
- 'eddie'
- 'eva'
- 'fgcz'
- 'genotoul'
- 'genouest'
- 'gis'
- 'google'
- 'hasta'
- 'hebbe'
- 'icr_davros'
- 'ifb_core'
- 'imperial'
- 'jax'
- 'lugh'
- 'marvin'
- 'maestro'
- 'mpcdf'
- 'munin'
- 'nu_genomics'
- 'nihbiowulf'
- 'oist'
- 'pasteur'
- 'phoenix'
- 'prince'
- 'rosalind'
- 'sahmri'
- 'sanger'
- 'seg_globe'
- 'uct_hpc'
- 'unibe_ibu'
- 'uppmax'
- 'utd_ganymede'
- 'utd_sysbio'
- 'uzh'
- 'vai'
matrix:
profile:
- "abims"
- "alice"
- "aws_tower"
- "awsbatch"
- "azurebatch"
- "bi"
- "bigpurple"
- "binac"
- "biohpc_gen"
- "cambridge"
- "leicester"
- "cbe"
- "ccga_dx"
- "ccga_med"
- "cfc"
- "cfc_dev"
- "cheaha"
- "computerome"
- "crick"
- "denbi_qbic"
- "ebc"
- "eddie"
- "eva"
- "fgcz"
- "genotoul"
- "genouest"
- "gis"
- "google"
- "hasta"
- "hebbe"
- "icr_davros"
- "ifb_core"
- "imperial"
- "jax"
- "lugh"
- "marvin"
- "maestro"
- "mpcdf"
- "munin"
- "nu_genomics"
- "nihbiowulf"
- "oist"
- "pasteur"
- "phoenix"
- "prince"
- "rosalind"
- "sahmri"
- "sanger"
- "seg_globe"
- "uct_hpc"
- "unibe_ibu"
- "uppmax"
- "utd_ganymede"
- "utd_sysbio"
- "uzh"
- "vai"
steps:
- uses: actions/checkout@v1
- name: Install Nextflow
Expand All @@ -96,4 +95,4 @@ jobs:
env:
SCRATCH: "~"
NXF_GLOBAL_CONFIG: awsbatch.config
run: nextflow run ${GITHUB_WORKSPACE}/configtest.nf -profile ${{ matrix.profile }}
run: nextflow run ${GITHUB_WORKSPACE}/configtest.nf -profile ${{ matrix.profile }}
7 changes: 7 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# gitignore
.nextflow*
work/
data/
results/
.DS_Store
*.code-workspace
1 change: 1 addition & 0 deletions .prettierrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
printWidth: 120
Loading

0 comments on commit 2c18f8c

Please sign in to comment.