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:40:06 +01:00 · 2019-10-08 16:40:06 +01:00 · 64c6ba9ec3
parent 33b133c200
commit 64c6ba9ec3
1 changed files with 1 additions and 0 deletions
--- a/.yamllint
+++ b/.yamllint
@ -20,6 +20,7 @@ yaml-files:
  # Default settings
  - '*.yaml'
  - '*.yml'
+  - .salt-lint
  - .yamllint
  # SaltStack Formulas additional settings
  - '*.example'