Skip to content

Commit

Permalink
feat(salt-lint): include for this repo
Browse files Browse the repository at this point in the history
  • Loading branch information
myii committed Oct 10, 2019
1 parent 8d86eb4 commit 1d9636e
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 2 deletions.
1 change: 1 addition & 0 deletions pillar.example
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ ssf:
- inspec/README.md
- .gitignore
- .cirrus.yml
- .salt-lint
- .travis.yml
- .yamllint
- commitlint.config.js
Expand Down
1 change: 1 addition & 0 deletions ssf/config/formulas.sls
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ prepare-git-branch-for-{{ formula }}:
platforms: {{ context.platforms | yaml }}
platforms_matrix: {{ context.platforms_matrix | yaml }}
platforms_matrix_commented_includes: {{ context.platforms_matrix_commented_includes | yaml }}
salt_lint: {{ context.salt_lint | yaml }}
script_kitchen: {{ context.script_kitchen | yaml }}
suite: {{ suite | yaml }}
travis: {{ context.travis | yaml }}
Expand Down
6 changes: 4 additions & 2 deletions ssf/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ ssf_node_anchors:
# An alternative method could be to use:
# `git describe --abbrev=0 --tags`
# yamllint disable rule:line-length
title: 'feat(tofs): implementation for all file.managed'
body: '* Checked using https://github.com/myii/ssf-formula/pull/54'
title: 'ci: merge travis matrix, add `salt-lint` & `rubocop` to `lint` job'
body: '* Automated using https://github.com/myii/ssf-formula/pull/60'
# yamllint enable rule:line-length
github:
owner: saltstack-formulas
Expand Down Expand Up @@ -164,6 +164,7 @@ ssf_node_anchors:
# To deal with excessive instances when mimicking `kitchen list -b`
# If values are set, only use these as commented entries in the matrix
platforms_matrix_commented_includes: []
salt_lint: {}
script_kitchen:
bin: bin/kitchen
cmd: verify
Expand All @@ -187,6 +188,7 @@ ssf_node_anchors:
default:
- '*.yaml'
- '*.yml'
- '.salt-lint'
- '.yamllint'
additional_ssf:
- '*.example'
Expand Down
13 changes: 13 additions & 0 deletions ssf/files/default/.salt-lint
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
exclude_paths: []
skip_list:
# Using `salt-lint` for linting other files as well, such as Jinja macros/templates
- 205 # Use ".sls" as a Salt State file extension
# Skipping `207` and `208` because `210` is sufficient, at least for the time-being
# I.e. Allows 3-digit unquoted codes to still be used, such as `644` and `755`
- 207 # File modes should always be encapsulated in quotation marks
- 208 # File modes should always contain a leading zero
tags: []
verbosity: 1
5 changes: 5 additions & 0 deletions ssf/formulas.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,9 @@ ssf_node_anchors:
.cirrus.yml: &file__--cirrus--yml
<<: *file_default
template: jinja
.salt-lint: &file__--salt-lint
<<: *file_default
template: jinja
.travis.yml: &file__--travis--yml
<<: *file_default
template: jinja
Expand Down Expand Up @@ -1256,6 +1259,7 @@ ssf:
ignore:
additional:
- ssf/files/default/.cirrus.yml
- ssf/files/default/.salt-lint
- ssf/files/default/.travis.yml
- ssf/files/default/.yamllint
- ssf/files/default/kitchen.yml
Expand All @@ -1274,6 +1278,7 @@ ssf:
docs/TOFS_pattern.rst: *file__docs__TOFS_pattern--rst
formula/libtofs.jinja: *file__formula__libtofs--jinja
.gitignore: *file__--gitignore
.salt-lint: *file__--salt-lint
.travis.yml: *file__--travis--yml
.yamllint: *file__--yamllint
commitlint.config.js: *file__commitlint--config--js
Expand Down

0 comments on commit 1d9636e

Please sign in to comment.