Skip to content

Commit 9124f3b

Browse files
chore(copier): update template https://github.com/dafyddj/copier-ssf-ci to v2.11.11
1 parent aacea3e commit 9124f3b

9 files changed

Lines changed: 150 additions & 228 deletions

File tree

‎.copier-answers.ssf-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
2-
_commit: v2.11.7
2+
_commit: v2.11.11
33
_src_path: https://github.com/dafyddj/copier-ssf-ci
44
failure_permitted_ignored: []
55
failure_permitted_patterns: []

‎.github/workflows/main.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
name: Lint / `pre-commit`
2626
needs: should-run
2727
if: fromJSON(needs.should-run.outputs.should-run)
28-
container: techneg/ci-pre-commit:v2.5.52@sha256:c5ce7075611cc185ea8e0992dec3cf1157382452f6ede9be86bee8baed09395d
28+
container: techneg/ci-pre-commit:v2.5.58@sha256:56e0bf7d16560020b738a2378240643ccb399350a540e906ca1e27009ffe2d68
2929
runs-on: ubuntu-latest
3030
timeout-minutes: 10
3131
steps:
@@ -61,19 +61,19 @@ jobs:
6161
issues: write
6262
pull-requests: write
6363
checks: read
64-
container: techneg/ci-semantic-release:v1.2.51@sha256:a57103734a036c435ec6a1adb35a823eeb20498794bd9020e2fb01eb3b96baa3
64+
container: techneg/ci-semantic-release:v1.2.58@sha256:723edbddfa534c7c137f09adec5fb2dfd6286d3fcb9c63688d7e5265ca4dd77e
6565
runs-on: ubuntu-latest
6666
timeout-minutes: 15
6767
steps:
6868
- run: | # Needed due to bug actions/checkout#2031
6969
git config --global --add safe.directory "$GITHUB_WORKSPACE"
7070
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
7171
# yamllint disable-line rule:line-length
72-
- uses: poseidon/wait-for-status-checks@899c768d191b56eef585c18f8558da19e1f3e707 # v0.6.0
72+
- uses: poseidon/wait-for-status-checks@e7e24423722c5b8e97a6dd5848827d2a412f812d # v0.7.0
7373
with:
7474
ignore: >
7575
Dependabot,
76-
Release / Collect results
76+
Release / Collect results,
7777
ignore_pattern: ^GitLab CI
7878
token: ${{ secrets.GITHUB_TOKEN }}
7979
- name: Run `semantic-release`

‎.gitlab-ci.yml‎

Lines changed: 22 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@
1515
stage_test: &stage_test 'test'
1616
# `image`
1717
# yamllint disable rule:line-length
18-
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.150@sha256:2d2de135abb0129cabe4fb282add9db5367a738db21396b5d45905b9a7820ff5'
19-
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.119@sha256:ce526677c95f95d50559d42f0b934c90c8cb0ec9d67bcd95c156f8cf51f10a82'
20-
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.119@sha256:ce526677c95f95d50559d42f0b934c90c8cb0ec9d67bcd95c156f8cf51f10a82'
21-
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.5.52@sha256:c5ce7075611cc185ea8e0992dec3cf1157382452f6ede9be86bee8baed09395d'
22-
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:a2abed57112d1931b77b30138d8f6a211303f10f2d03d42513cfbe7de1e25963'
23-
image_semantic-release: &image_semanticrelease 'techneg/ci-semantic-release:v1.2.51@sha256:a57103734a036c435ec6a1adb35a823eeb20498794bd9020e2fb01eb3b96baa3'
18+
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.156@sha256:90b61f1eadad21123849ef29ee63ba796aa74be868942fb4e623efd6ced4b624'
19+
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.125@sha256:216120abc59355bd84b9dcad97d10f40884dbc41139971605eb8474f1a9e00b9'
20+
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.125@sha256:216120abc59355bd84b9dcad97d10f40884dbc41139971605eb8474f1a9e00b9'
21+
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.5.58@sha256:56e0bf7d16560020b738a2378240643ccb399350a540e906ca1e27009ffe2d68'
22+
image_semantic-release: &image_semanticrelease 'techneg/ci-semantic-release:v1.2.58@sha256:723edbddfa534c7c137f09adec5fb2dfd6286d3fcb9c63688d7e5265ca4dd77e'
2423
# `services`
2524
services_docker_dind: &services_docker_dind
26-
- 'docker:29.6.2-dind@sha256:bfec1f5159c63a81ca6fdedbd81404d2c0e16378ed0feec3bb3fbf3998847659'
25+
- 'docker:29.8.0-dind@sha256:5efed980cba3fc126cf54e21a5a6ff8849d05b6e0623d6e7612f48e9cd6cd17e'
2726
# yamllint enable rule:line-length
2827
# `variables`
2928
# https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3
@@ -77,7 +76,7 @@ build-cache:
7776
script: *bundle_install
7877

7978
###############################################################################
80-
# `lint` stage: `commitlint`, `pre-commit` & `rubocop` (latest, failure allowed)
79+
# `lint` stage: `commitlint`, `pre-commit`
8180
###############################################################################
8281
.lint_job:
8382
stage: *stage_lint
@@ -113,19 +112,6 @@ pre-commit:
113112
- 'pre-commit run --all-files --color always --verbose'
114113
- 'pre-commit run --color always --hook-stage manual commitlint-ci'
115114

116-
# Use a separate job for `rubocop` other than the one potentially run by `pre-commit`
117-
# - The `pre-commit` check will only be available for formulas that pass the default
118-
# `rubocop` check -- and must continue to do so
119-
# - This job is allowed to fail, so can be used for all formulas
120-
# - Furthermore, this job uses all of the latest `rubocop` features & cops,
121-
# which will help when upgrading the `rubocop` linter used in `pre-commit`
122-
rubocop:
123-
extends: '.lint_job'
124-
allow_failure: true
125-
image: *image_rubocop
126-
script:
127-
- 'rubocop -d -P -S --enable-pending-cops'
128-
129115
###############################################################################
130116
# Define `test` template
131117
###############################################################################
@@ -166,73 +152,55 @@ almalinux-8-master: {extends: '.test_instance_failure_permitted'}
166152
amazonlinux-2023-master: {extends: '.test_instance_failure_permitted'}
167153
amazonlinux-2-master: {extends: '.test_instance_failure_permitted'}
168154
centos-stream9-master: {extends: '.test_instance_failure_permitted'}
155+
debian-13-master: {extends: '.test_instance_failure_permitted'}
169156
debian-12-master: {extends: '.test_instance_failure_permitted'}
170-
debian-11-master: {extends: '.test_instance_failure_permitted'}
171-
fedora-41-master: {extends: '.test_instance_failure_permitted'}
172-
fedora-40-master: {extends: '.test_instance_failure_permitted'}
173-
opensuse-leap-156-master: {extends: '.test_instance_failure_permitted'}
157+
fedora-44-master: {extends: '.test_instance_failure_permitted'}
158+
fedora-43-master: {extends: '.test_instance_failure_permitted'}
159+
opensuse-leap-160-master: {extends: '.test_instance_failure_permitted'}
174160
opensuse-tmbl-latest-master: {extends: '.test_instance_failure_permitted'}
175161
oraclelinux-9-master: {extends: '.test_instance_failure_permitted'}
176162
oraclelinux-8-master: {extends: '.test_instance_failure_permitted'}
177163
rockylinux-9-master: {extends: '.test_instance_failure_permitted'}
178164
rockylinux-8-master: {extends: '.test_instance_failure_permitted'}
165+
ubuntu-2604-master: {extends: '.test_instance_failure_permitted'}
179166
ubuntu-2404-master: {extends: '.test_instance_failure_permitted'}
180167
ubuntu-2204-master: {extends: '.test_instance_failure_permitted'}
181-
ubuntu-2004-master: {extends: '.test_instance_failure_permitted'}
182168
almalinux-9-3008: {extends: '.test_instance'}
183169
almalinux-8-3008: {extends: '.test_instance'}
184170
amazonlinux-2023-3008: {extends: '.test_instance'}
185171
amazonlinux-2-3008: {extends: '.test_instance_failure_permitted'}
186172
centos-stream9-3008: {extends: '.test_instance'}
173+
debian-13-3008: {extends: '.test_instance'}
187174
debian-12-3008: {extends: '.test_instance'}
188-
debian-11-3008: {extends: '.test_instance'}
189-
fedora-41-3008: {extends: '.test_instance_failure_permitted'}
190-
fedora-40-3008: {extends: '.test_instance'}
191-
opensuse-leap-156-3008: {extends: '.test_instance'}
175+
fedora-44-3008: {extends: '.test_instance'}
176+
fedora-43-3008: {extends: '.test_instance'}
177+
opensuse-leap-160-3008: {extends: '.test_instance'}
192178
opensuse-tmbl-latest-3008: {extends: '.test_instance'}
193179
oraclelinux-9-3008: {extends: '.test_instance'}
194180
oraclelinux-8-3008: {extends: '.test_instance'}
195181
rockylinux-9-3008: {extends: '.test_instance'}
196182
rockylinux-8-3008: {extends: '.test_instance'}
183+
ubuntu-2604-3008: {extends: '.test_instance'}
197184
ubuntu-2404-3008: {extends: '.test_instance'}
198185
ubuntu-2204-3008: {extends: '.test_instance'}
199-
ubuntu-2004-3008: {extends: '.test_instance'}
200-
almalinux-9-3007: {extends: '.test_instance'}
201-
almalinux-8-3007: {extends: '.test_instance'}
202-
amazonlinux-2023-3007: {extends: '.test_instance'}
203-
amazonlinux-2-3007: {extends: '.test_instance_failure_permitted'}
204-
centos-stream9-3007: {extends: '.test_instance'}
205-
debian-12-3007: {extends: '.test_instance'}
206-
debian-11-3007: {extends: '.test_instance'}
207-
fedora-41-3007: {extends: '.test_instance_failure_permitted'}
208-
fedora-40-3007: {extends: '.test_instance'}
209-
opensuse-leap-156-3007: {extends: '.test_instance'}
210-
opensuse-tmbl-latest-3007: {extends: '.test_instance'}
211-
oraclelinux-9-3007: {extends: '.test_instance'}
212-
oraclelinux-8-3007: {extends: '.test_instance'}
213-
rockylinux-9-3007: {extends: '.test_instance'}
214-
rockylinux-8-3007: {extends: '.test_instance'}
215-
ubuntu-2404-3007: {extends: '.test_instance'}
216-
ubuntu-2204-3007: {extends: '.test_instance'}
217-
ubuntu-2004-3007: {extends: '.test_instance'}
218186
almalinux-9-3006: {extends: '.test_instance'}
219187
almalinux-8-3006: {extends: '.test_instance'}
220188
amazonlinux-2023-3006: {extends: '.test_instance'}
221189
amazonlinux-2-3006: {extends: '.test_instance_failure_permitted'}
222190
centos-stream9-3006: {extends: '.test_instance'}
191+
debian-13-3006: {extends: '.test_instance'}
223192
debian-12-3006: {extends: '.test_instance'}
224-
debian-11-3006: {extends: '.test_instance'}
225-
fedora-41-3006: {extends: '.test_instance_failure_permitted'}
226-
fedora-40-3006: {extends: '.test_instance'}
227-
opensuse-leap-156-3006: {extends: '.test_instance'}
193+
fedora-44-3006: {extends: '.test_instance'}
194+
fedora-43-3006: {extends: '.test_instance'}
195+
opensuse-leap-160-3006: {extends: '.test_instance'}
228196
opensuse-tmbl-latest-3006: {extends: '.test_instance'}
229197
oraclelinux-9-3006: {extends: '.test_instance'}
230198
oraclelinux-8-3006: {extends: '.test_instance'}
231199
rockylinux-9-3006: {extends: '.test_instance'}
232200
rockylinux-8-3006: {extends: '.test_instance'}
201+
ubuntu-2604-3006: {extends: '.test_instance'}
233202
ubuntu-2404-3006: {extends: '.test_instance'}
234203
ubuntu-2204-3006: {extends: '.test_instance'}
235-
ubuntu-2004-3006: {extends: '.test_instance'}
236204
# yamllint enable rule:line-length
237205

238206
###############################################################################

‎.pre-commit-config.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ repos:
2929
hooks:
3030
- id: commitlint
3131
- id: commitlint-ci
32-
- repo: https://github.com/rubocop-hq/rubocop
33-
rev: v1.88.2
32+
- repo: https://github.com/rubocop/rubocop
33+
rev: v1.90.0
3434
hooks:
3535
- id: rubocop
3636
name: Check Ruby files with rubocop
37-
args: [--debug]
37+
args: [--debug, --display-style-guide]
3838
- repo: https://github.com/shellcheck-py/shellcheck-py
3939
rev: v0.9.0.6
4040
hooks:
@@ -80,7 +80,7 @@ repos:
8080
name: Check Salt files using salt-lint
8181
files: ^.*\.(sls|jinja|j2|tmpl|tst)$
8282
- repo: https://github.com/rstcheck/rstcheck
83-
rev: v6.2.5
83+
rev: v6.3.0
8484
hooks:
8585
- id: rstcheck
8686
name: Check reST files using rstcheck
@@ -100,12 +100,12 @@ repos:
100100
)$
101101
additional_dependencies: [pygments==2.16.1]
102102
- repo: https://github.com/renovatebot/pre-commit-hooks
103-
rev: 43.285.3
103+
rev: 44.69.12
104104
hooks:
105105
- id: renovate-config-validator
106106
name: Check Renovate config with renovate-config-validator
107107
- repo: https://github.com/python-jsonschema/check-jsonschema
108-
rev: 0.37.4
108+
rev: 0.38.0
109109
hooks:
110110
- id: check-github-workflows
111111
name: Check GitHub workflows with check-jsonschema

‎Gemfile‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,14 @@ source ENV.fetch('PROXY_RUBYGEMSORG', 'https://rubygems.org')
88

99
# Install the `inspec` gem using `git` because versions after `4.22.22`
1010
# suppress diff output; this version fixes this for our uses.
11-
# rubocop:disable Layout/LineLength
11+
# rubocop:disable-next Layout/LineLength
1212
gem 'inspec', git: 'https://gitlab.com/saltstack-formulas/infrastructure/inspec', branch: 'ssf'
13-
# rubocop:enable Layout/LineLength
1413

1514
# Install the `kitchen-docker` gem using `git` in order to avoid an upstream
1615
# error caused by `kitchen-docker.gemspec`.
1716
# TODO: correct the error upstream
18-
# rubocop:disable Layout/LineLength
17+
# rubocop:disable-next Layout/LineLength
1918
gem 'kitchen-docker', git: 'https://github.com/dafyddj/kitchen-docker', branch: 'chore/gemspec'
20-
# rubocop:enable Layout/LineLength
2119

2220
gem 'kitchen-inspec', '3.1.0'
2321
gem 'kitchen-salt', '0.7.2'

‎Gemfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ GEM
464464
rdoc (>= 4.0.0)
465465
reline (>= 0.4.2)
466466
jmespath (1.6.2)
467-
json (2.20.0)
467+
json (2.21.2)
468468
jwt (3.2.0)
469469
base64
470470
kitchen-inspec (3.1.0)

0 commit comments

Comments
 (0)