Merge pull request #60 from myii/chore/standardise-structure
ci(yamllint): add rule `empty-values` & use new `yaml-files` setting
This commit is contained in:
commit
07bd524b95
2 changed files with 17 additions and 3 deletions
|
@ -56,9 +56,9 @@ jobs:
|
||||||
before_install: skip
|
before_install: skip
|
||||||
script:
|
script:
|
||||||
# Install and run `yamllint`
|
# Install and run `yamllint`
|
||||||
- pip install --user yamllint
|
# Need at least `v1.17.0` for the `yaml-files` setting
|
||||||
# yamllint disable-line rule:line-length
|
- pip install --user yamllint>=1.17.0
|
||||||
- yamllint -s . .yamllint pillar.example test/salt/pillar/kitchen.sls test/salt/pillar/default.sls
|
- yamllint -s .
|
||||||
# Install and run `commitlint`
|
# Install and run `commitlint`
|
||||||
- npm install @commitlint/config-conventional -D
|
- npm install @commitlint/config-conventional -D
|
||||||
- npm install @commitlint/travis-cli -D
|
- npm install @commitlint/travis-cli -D
|
||||||
|
|
14
.yamllint
14
.yamllint
|
@ -6,10 +6,24 @@ extends: default
|
||||||
|
|
||||||
# Files to ignore completely
|
# Files to ignore completely
|
||||||
# 1. All YAML files under directory `node_modules/`, introduced during the Travis run
|
# 1. All YAML files under directory `node_modules/`, introduced during the Travis run
|
||||||
|
# 2. Any SLS files under directory `test/`, which are actually state files
|
||||||
ignore: |
|
ignore: |
|
||||||
node_modules/
|
node_modules/
|
||||||
|
test/**/states/**/*.sls
|
||||||
|
|
||||||
|
yaml-files:
|
||||||
|
# Default settings
|
||||||
|
- '*.yaml'
|
||||||
|
- '*.yml'
|
||||||
|
- .yamllint
|
||||||
|
# SaltStack Formulas additional settings
|
||||||
|
- '*.example'
|
||||||
|
- test/**/*.sls
|
||||||
|
|
||||||
rules:
|
rules:
|
||||||
|
empty-values:
|
||||||
|
forbid-in-block-mappings: true
|
||||||
|
forbid-in-flow-mappings: true
|
||||||
line-length:
|
line-length:
|
||||||
# Increase from default of `80`
|
# Increase from default of `80`
|
||||||
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
|
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
|
||||||
|
|
Loading…
Reference in a new issue