Merge pull request #33 from myii/chore/standardise-structure

ci(yamllint): add rule `empty-values` & use new `yaml-files` setting
This commit is contained in:
Niels Abspoel 2019-09-12 18:11:52 +02:00 committed by GitHub
commit f747666d13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 3 deletions

View File

@ -64,9 +64,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 - 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

View File

@ -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`)