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

* Automated using myii/ssf-formula#60
saltstack-formulas · Oct 8, 2019 · 687e84f · 687e84f
1 parent 7cd0e53
commit 687e84f
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.yamllint b/.yamllint
@@ -17,6 +17,7 @@ yaml-files:
   # Default settings
   - '*.yaml'
   - '*.yml'
+  - .salt-lint
   - .yamllint
   # SaltStack Formulas additional settings
   - '*.example'