ci: merge travis matrix, add `salt-lint` & `rubocop` to `lint` job

* Automated using https://github.com/myii/ssf-formula/pull/60
2019-10-08 16:36:53 +01:00 · 2019-10-08 16:36:53 +01:00 · f31e34882d
parent e4d68312a1
commit f31e34882d
1 changed files with 1 additions and 0 deletions
--- a/.yamllint
+++ b/.yamllint
@ -17,6 +17,7 @@ yaml-files:
  # Default settings
  - '*.yaml'
  - '*.yml'
+  - .salt-lint
  - .yamllint
  # SaltStack Formulas additional settings
  - '*.example'