Skip to content

Commit fa4ffad

Browse files
committed
test(pre-commit): update pre-commit hooks
1 parent 1848fd6 commit fa4ffad

File tree

4 files changed

+265
-221
lines changed

4 files changed

+265
-221
lines changed

.gitlab-ci.yml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@
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.2'
18+
image_dindrubybionic: &image_dindrubybionic 'dafyddj/ci-dind-python-ruby:2.0.2'
19+
image_precommit: &image_precommit 'dafyddj/ci-pre-commit:2.1.0'
2120
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest'
2221
image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14'
2322
# `services`
@@ -145,23 +144,23 @@ rubocop:
145144
# default-almalinux-8-tiamat-py3: {extends: '.test_instance'}
146145
# default-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
147146
default-debian-11-master-py3: {extends: '.test_instance'}
148-
default-debian-10-master-py3: {extends: '.test_instance'}
149-
default-debian-9-master-py3: {extends: '.test_instance'}
147+
# default-debian-10-master-py3: {extends: '.test_instance'}
148+
# default-debian-9-master-py3: {extends: '.test_instance'}
150149
default-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
151150
default-ubuntu-2004-master-py3: {extends: '.test_instance'}
152-
default-ubuntu-1804-master-py3: {extends: '.test_instance'}
153-
default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
154-
default-centos-7-master-py3: {extends: '.test_instance'}
151+
# default-ubuntu-1804-master-py3: {extends: '.test_instance'}
152+
# default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
153+
# default-centos-7-master-py3: {extends: '.test_instance'}
155154
default-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
156155
default-fedora-35-master-py3: {extends: '.test_instance'}
157156
default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
158-
default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
157+
# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
159158
default-amazonlinux-2-master-py3: {extends: '.test_instance'}
160159
default-oraclelinux-8-master-py3: {extends: '.test_instance'}
161-
default-oraclelinux-7-master-py3: {extends: '.test_instance'}
160+
# default-oraclelinux-7-master-py3: {extends: '.test_instance'}
162161
default-arch-base-latest-master-py3: {extends: '.test_instance'}
163-
default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
164-
default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
162+
default-gentoo-stage3-latest-master-py3: {extends: '.test_instance_failure_permitted'}
163+
default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance_failure_permitted'}
165164
default-almalinux-8-master-py3: {extends: '.test_instance'}
166165
default-rockylinux-8-master-py3: {extends: '.test_instance'}
167166
# default-debian-11-3004-1-py3: {extends: '.test_instance'}

.pre-commit-config.yaml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,42 +24,38 @@ 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/config-conventional@8.3.4']
28-
- id: commitlint-travis
29-
stages: [manual]
30-
additional_dependencies: ['@commitlint/config-conventional@8.3.4']
31-
always_run: true
27+
additional_dependencies: ['@commitlint/config-conventional@17.1.0']
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.4
6359
hooks:
6460
- id: rstcheck
6561
name: Check reST files using rstcheck
@@ -74,4 +70,4 @@ repos:
7470
docs/CHANGELOG.rst|
7571
docs/TOFS_pattern.rst|
7672
)$
77-
additional_dependencies: [pygments==2.9.0]
73+
additional_dependencies: [pygments==2.16.1]

Gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,6 @@ gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure
1717

1818
gem 'kitchen-inspec', '>= 2.5.0'
1919
gem 'kitchen-salt', '>= 0.7.2'
20+
21+
# Avoid the error 'pkeys are immutable on OpenSSL 3.0'
22+
gem 'net-ssh', '>= 7.0.0'

0 commit comments

Comments
 (0)