Skip to content

Commit 91de65d

Browse files
committed
chore: run ssf across all ssf-formula files to bring up-to-date
1 parent acc0b05 commit 91de65d

File tree

6 files changed

+21
-6
lines changed

6 files changed

+21
-6
lines changed

.gitignore

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ celerybeat-schedule
9191
venv/
9292
ENV/
9393

94+
# visual studio
95+
.vs/
96+
9497
# Spyder project settings
9598
.spyderproject
9699
.spyproject
@@ -120,3 +123,11 @@ docs/*.md
120123
Dockerfile.*_*
121124
ignore/
122125
tmp/
126+
127+
# `salt-formula` -- Vagrant Specific files
128+
.vagrant
129+
top.sls
130+
131+
# `suricata-formula` -- Platform binaries
132+
*.rpm
133+
*.deb

.gitlab-ci.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,9 @@
2525
stages:
2626
- *stage_lint
2727
- *stage_release
28-
variables:
29-
DOCKER_DRIVER: 'overlay2'
3028

3129
###############################################################################
32-
# `lint` stage: `commitlint` & `pre-commit`
30+
# `lint` stage: `commitlint`, `pre-commit` & `rubocop` (latest, failure allowed)
3331
###############################################################################
3432
commitlint:
3533
stage: *stage_lint

.pre-commit-config.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,13 @@ repos:
2525
args: [--debug]
2626
always_run: true
2727
pass_filenames: false
28-
- repo: https://github.com/jumanjihouse/pre-commit-hooks
29-
rev: 2.1.3
28+
- repo: https://github.com/shellcheck-py/shellcheck-py
29+
rev: v0.7.1.1
3030
hooks:
3131
- id: shellcheck
3232
name: Check shell scripts with shellcheck
3333
files: ^.*\.(sh|bash|ksh)$
3434
types: []
35-
args: []
3635
- repo: https://github.com/adrienverge/yamllint
3736
rev: v1.23.0
3837
hooks:

.rubocop.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ Metrics/BlockLength:
1212
- describe
1313
# Increase from default of `25`
1414
Max: 30
15+
Security/YAMLLoad:
16+
Exclude:
17+
- test/integration/**/_mapdata.rb
1518

1619
# General settings across all cops in this formula
1720
AllCops:

.yamllint

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ ignore: |
2929
ssf/files/default/.yamllint
3030
ssf/files/default/inspec/inspec.yml
3131
ssf/files/default/kitchen.yml
32+
ssf/files/default/kitchen.windows.yml
3233
ssf/files/default/.github/workflows/kitchen.yml
34+
ssf/files/default/.github/workflows/kitchen.windows.yml
3335
ssf/files/tofs_arvados-formula/.travis.yml
3436
ssf/files/tofs_ssf-formula/.yamllint
3537

ssf/formulas.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4444,7 +4444,9 @@ ssf:
44444444
- ssf/files/default/.yamllint
44454445
- ssf/files/default/inspec/inspec.yml
44464446
- ssf/files/default/kitchen.yml
4447+
- ssf/files/default/kitchen.windows.yml
44474448
- ssf/files/default/.github/workflows/kitchen.yml
4449+
- ssf/files/default/.github/workflows/kitchen.windows.yml
44484450
- ssf/files/tofs_arvados-formula/.travis.yml
44494451
- ssf/files/tofs_ssf-formula/.yamllint
44504452
rules:

0 commit comments

Comments
 (0)