Skip to content

Commit 1ca9120

Browse files
authored
Merge pull request #557 from dafyddj/test/pre-commit
chore: update and fix `pre-commit` checks
2 parents 2a7a9de + 037b529 commit 1ca9120

File tree

4 files changed

+257
-213
lines changed

4 files changed

+257
-213
lines changed

.gitlab-ci.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@
1414
stage_test: &stage_test 'test'
1515
# `image`
1616
image_commitlint: &image_commitlint 'myii/ssf-commitlint:11'
17-
image_dindruby: &image_dindruby 'myii/ssf-dind-ruby:2.7.1-r3'
18-
image_precommit: &image_precommit
19-
name: 'myii/ssf-pre-commit:2.9.2'
20-
entrypoint: ['/bin/bash', '-c']
17+
image_dindruby: &image_dindruby 'dafyddj/ci-dind-python-ruby:2.0.0'
18+
image_precommit: &image_precommit 'dafyddj/ci-pre-commit:2.0.2'
2119
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest'
2220
image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14'
2321
# `services`

.pre-commit-config.yaml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,46 +24,43 @@ repos:
2424
name: Check commit message using commitlint
2525
description: Lint commit message against @commitlint/config-conventional rules
2626
stages: [commit-msg]
27-
additional_dependencies: ['@commitlint/[email protected]']
28-
- id: commitlint-travis
29-
stages: [manual]
30-
additional_dependencies: ['@commitlint/[email protected]']
31-
always_run: true
27+
additional_dependencies: ['@commitlint/[email protected]']
3228
- repo: https://github.com/rubocop-hq/rubocop
33-
rev: v1.30.1
29+
rev: v1.57.0
3430
hooks:
3531
- id: rubocop
3632
name: Check Ruby files with rubocop
3733
args: [--debug]
3834
always_run: true
3935
pass_filenames: false
4036
- repo: https://github.com/shellcheck-py/shellcheck-py
41-
rev: v0.8.0.4
37+
rev: v0.9.0.6
4238
hooks:
4339
- id: shellcheck
4440
name: Check shell scripts with shellcheck
4541
files: ^.*\.(sh|bash|ksh)$
4642
types: []
4743
- repo: https://github.com/adrienverge/yamllint
48-
rev: v1.26.3
44+
rev: v1.32.0
4945
hooks:
5046
- id: yamllint
5147
name: Check YAML syntax with yamllint
5248
args: [--strict, '.']
5349
always_run: true
5450
pass_filenames: false
5551
- repo: https://github.com/warpnet/salt-lint
56-
rev: v0.8.0
52+
rev: v0.9.2
5753
hooks:
5854
- id: salt-lint
5955
name: Check Salt files using salt-lint
6056
files: ^.*\.(sls|jinja|j2|tmpl|tst)$
6157
- repo: https://github.com/myint/rstcheck
62-
rev: 3f929574
58+
rev: v6.2.0
6359
hooks:
6460
- id: rstcheck
6561
name: Check reST files using rstcheck
6662
exclude: 'docs/CHANGELOG.rst'
63+
additional_dependencies: [sphinx==7.2.6]
6764
- repo: https://github.com/saltstack-formulas/mirrors-rst-lint
6865
rev: v1.3.2
6966
hooks:
@@ -74,4 +71,4 @@ repos:
7471
docs/CHANGELOG.rst|
7572
docs/TOFS_pattern.rst|
7673
)$
77-
additional_dependencies: [pygments==2.9.0]
74+
additional_dependencies: [pygments==2.16.1]

Gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure
1818
gem 'kitchen-inspec', '>= 2.5.0'
1919
gem 'kitchen-salt', '>= 0.7.2'
2020

21+
# Avoid the error 'pkeys are immutable on OpenSSL 3.0'
22+
gem 'net-ssh', '>= 7.0.0'
23+
2124
group :vagrant do
2225
gem 'kitchen-vagrant'
2326
end

0 commit comments

Comments
 (0)