Skip to content

Commit

Permalink
ci(yamllint): add rule empty-values & use new yaml-files setting
Browse files Browse the repository at this point in the history
* Automated using #27
  • Loading branch information
myii committed Sep 12, 2019
1 parent ff855a1 commit 1d418e9
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
before_install: skip
script:
# Install and run `yamllint`
- pip install --user yamllint
# yamllint disable-line rule:line-length
- yamllint -s . .yamllint pillar.example
# Need at least `v1.17.0` for the `yaml-files` setting
- pip install --user yamllint>=1.17.0
- yamllint -s .
# Install and run `commitlint`
- npm install @commitlint/config-conventional -D
- npm install @commitlint/travis-cli -D
Expand Down
16 changes: 15 additions & 1 deletion .yamllint
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,36 @@ extends: default

# Files to ignore completely
# 1. All YAML files under directory `node_modules/`, introduced during the Travis run
# 2. All Jinja templates under `ssf/files/` (result in `yamllint` syntax errors)
# 2. Any SLS files under directory `test/`, which are actually state files
# 3. All Jinja templates under `ssf/files/` (result in `yamllint` syntax errors)
# Not disabling via. `*.yml` since we may end up with non-Jinja YAML files here
ignore: |
node_modules/
test/**/states/**/*.sls
ssf/files/default/.cirrus.yml
ssf/files/default/.travis.yml
ssf/files/default/.yamllint
ssf/files/default/kitchen.yml
ssf/files/default/inspec/inspec.yml
yaml-files:
# Default settings
- '*.yaml'
- '*.yml'
- .yamllint
# SaltStack Formulas additional settings
- '*.example'
- test/**/*.sls

rules:
commas:
# Allow separation between commas to achieve tabular layout under `platforms`
ignore: |
ssf/defaults.yaml
ssf/formulas.yaml
empty-values:
forbid-in-block-mappings: true
forbid-in-flow-mappings: true
line-length:
# Increase from default of `80`
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
Expand Down

0 comments on commit 1d418e9

Please sign in to comment.