Skip to content

Commit 6940316

Browse files
chore(copier): update template https://github.com/dafyddj/copier-ssf-ci to v2.10.2
1 parent 67871d0 commit 6940316

File tree

9 files changed

+207
-168
lines changed

9 files changed

+207
-168
lines changed

.copier-answers.ssf-ci.yml

Lines changed: 2 additions & 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.8.0
2+
_commit: v2.10.2
33
_src_path: https://github.com/dafyddj/copier-ssf-ci
44
failure_permitted_ignored: []
55
failure_permitted_patterns: []
@@ -19,3 +19,4 @@ supported_oses:
1919
- Oracle Linux
2020
- Rocky Linux
2121
- Ubuntu
22+
test_using_gha: false

.github/workflows/main.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@ 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.5@sha256:9d92b83a64378da3f9363668b0da244d9f12039d86579881d649ddb40ce261f3
28+
container: techneg/ci-pre-commit:v2.5.19@sha256:64cb1f774a3d6abdd498f6be4b3dbe261f821e1dd088c00c23504f39d0c1cf03
2929
runs-on: ubuntu-latest
3030
timeout-minutes: 10
3131
steps:
3232
- run: | # Needed because of bug #2031 in `actions/checkout`
3333
git config --global --add safe.directory "$GITHUB_WORKSPACE"
34-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
34+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
3535
with:
3636
fetch-depth: 0
3737
fetch-tags: true
3838
filter: tree:0
3939
- name: Export `CI_CACHE_ID` from container
4040
run: echo "CI_CACHE_ID=$(cat /.ci_cache_id)" >> $GITHUB_ENV
41-
- uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
41+
- uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
4242
with:
4343
path: ~/.cache/pre-commit
4444
key: "${{ env.CI_CACHE_ID }}|\
@@ -61,13 +61,13 @@ jobs:
6161
issues: write
6262
pull-requests: write
6363
checks: read
64-
container: techneg/ci-semantic-release:v1.2.4@sha256:e7cfe36054a56382568c0824d2539a67a956711d7b674093db320815e928ee27
64+
container: techneg/ci-semantic-release:v1.2.17@sha256:4db8d4b3b1451131ce77bd857254de2f3c5579172955b2a6a2d4ec4326789196
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"
70-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
70+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
7171
# yamllint disable-line rule:line-length
7272
- uses: poseidon/wait-for-status-checks@899c768d191b56eef585c18f8558da19e1f3e707 # v0.6.0
7373
with:

.gitlab-ci.yml

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
stage_test: &stage_test 'test'
1616
# `image`
1717
# yamllint disable rule:line-length
18-
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.103@sha256:3a2bf514e461769ed7b8880213e9637186bb7e17e0653b4a6ad3f249e4a60d33'
19-
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.72@sha256:20873e73badc9d5ea93e20ef745f64fe957625a755a60c91e3dad600217e2c76'
20-
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.72@sha256:20873e73badc9d5ea93e20ef745f64fe957625a755a60c91e3dad600217e2c76'
21-
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.5.5@sha256:9d92b83a64378da3f9363668b0da244d9f12039d86579881d649ddb40ce261f3'
22-
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:fe69f9642c7edde46bbd78326d2c42c6e13fc73694efb142e92e206725479328'
23-
image_semantic-release: &image_semanticrelease 'techneg/ci-semantic-release:v1.2.4@sha256:e7cfe36054a56382568c0824d2539a67a956711d7b674093db320815e928ee27'
18+
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.116@sha256:98d5550565bb2563901005fd07aabfa5be206db38c4b195ffce44d297ae2b84c'
19+
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.86@sha256:0939b6184329615704d51e984af490c2339cc1a31a5db0cef252684cc6b8f8ea'
20+
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.86@sha256:0939b6184329615704d51e984af490c2339cc1a31a5db0cef252684cc6b8f8ea'
21+
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.5.19@sha256:64cb1f774a3d6abdd498f6be4b3dbe261f821e1dd088c00c23504f39d0c1cf03'
22+
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:74850471782195453cdf91f4a5edf62b6fcc3365c124d4d975c7e87a702040d7'
23+
image_semantic-release: &image_semanticrelease 'techneg/ci-semantic-release:v1.2.17@sha256:4db8d4b3b1451131ce77bd857254de2f3c5579172955b2a6a2d4ec4326789196'
2424
# `services`
2525
services_docker_dind: &services_docker_dind
26-
- 'docker:28.3.3-dind@sha256:a56b3bdde89315ed2cc0e4906e582b5033d93bf20d9cb9510c2cdd4e7f7690b1'
26+
- 'docker:29.1.1-dind@sha256:9b20eb23e1f0443655673efb9db76c4b18cc1b45de1fcf82b3c1b749b9647bdf'
2727
# yamllint enable rule:line-length
2828
# `variables`
2929
# https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3
@@ -175,42 +175,42 @@ rockylinux-8-master: {extends: '.test_instance_failure_permitted'}
175175
ubuntu-2404-master: {extends: '.test_instance_failure_permitted'}
176176
ubuntu-2204-master: {extends: '.test_instance_failure_permitted'}
177177
ubuntu-2004-master: {extends: '.test_instance_failure_permitted'}
178-
almalinux-9-3007-7: {extends: '.test_instance'}
179-
almalinux-8-3007-7: {extends: '.test_instance'}
180-
amazonlinux-2023-3007-7: {extends: '.test_instance'}
181-
amazonlinux-2-3007-7: {extends: '.test_instance_failure_permitted'}
182-
centos-stream9-3007-7: {extends: '.test_instance'}
183-
debian-12-3007-7: {extends: '.test_instance'}
184-
debian-11-3007-7: {extends: '.test_instance'}
185-
fedora-41-3007-7: {extends: '.test_instance_failure_permitted'}
186-
fedora-40-3007-7: {extends: '.test_instance'}
187-
opensuse-leap-156-3007-7: {extends: '.test_instance'}
188-
opensuse-tmbl-latest-3007-7: {extends: '.test_instance'}
189-
oraclelinux-9-3007-7: {extends: '.test_instance'}
190-
oraclelinux-8-3007-7: {extends: '.test_instance'}
191-
rockylinux-9-3007-7: {extends: '.test_instance'}
192-
rockylinux-8-3007-7: {extends: '.test_instance'}
193-
ubuntu-2404-3007-7: {extends: '.test_instance'}
194-
ubuntu-2204-3007-7: {extends: '.test_instance'}
195-
ubuntu-2004-3007-7: {extends: '.test_instance'}
196-
almalinux-9-3006-15: {extends: '.test_instance'}
197-
almalinux-8-3006-15: {extends: '.test_instance'}
198-
amazonlinux-2023-3006-15: {extends: '.test_instance'}
199-
amazonlinux-2-3006-15: {extends: '.test_instance_failure_permitted'}
200-
centos-stream9-3006-15: {extends: '.test_instance'}
201-
debian-12-3006-15: {extends: '.test_instance'}
202-
debian-11-3006-15: {extends: '.test_instance'}
203-
fedora-41-3006-15: {extends: '.test_instance_failure_permitted'}
204-
fedora-40-3006-15: {extends: '.test_instance'}
205-
opensuse-leap-156-3006-15: {extends: '.test_instance'}
206-
opensuse-tmbl-latest-3006-15: {extends: '.test_instance'}
207-
oraclelinux-9-3006-15: {extends: '.test_instance'}
208-
oraclelinux-8-3006-15: {extends: '.test_instance'}
209-
rockylinux-9-3006-15: {extends: '.test_instance'}
210-
rockylinux-8-3006-15: {extends: '.test_instance'}
211-
ubuntu-2404-3006-15: {extends: '.test_instance'}
212-
ubuntu-2204-3006-15: {extends: '.test_instance'}
213-
ubuntu-2004-3006-15: {extends: '.test_instance'}
178+
almalinux-9-3007: {extends: '.test_instance'}
179+
almalinux-8-3007: {extends: '.test_instance'}
180+
amazonlinux-2023-3007: {extends: '.test_instance'}
181+
amazonlinux-2-3007: {extends: '.test_instance_failure_permitted'}
182+
centos-stream9-3007: {extends: '.test_instance'}
183+
debian-12-3007: {extends: '.test_instance'}
184+
debian-11-3007: {extends: '.test_instance'}
185+
fedora-41-3007: {extends: '.test_instance_failure_permitted'}
186+
fedora-40-3007: {extends: '.test_instance'}
187+
opensuse-leap-156-3007: {extends: '.test_instance'}
188+
opensuse-tmbl-latest-3007: {extends: '.test_instance'}
189+
oraclelinux-9-3007: {extends: '.test_instance'}
190+
oraclelinux-8-3007: {extends: '.test_instance'}
191+
rockylinux-9-3007: {extends: '.test_instance'}
192+
rockylinux-8-3007: {extends: '.test_instance'}
193+
ubuntu-2404-3007: {extends: '.test_instance'}
194+
ubuntu-2204-3007: {extends: '.test_instance'}
195+
ubuntu-2004-3007: {extends: '.test_instance'}
196+
almalinux-9-3006: {extends: '.test_instance'}
197+
almalinux-8-3006: {extends: '.test_instance'}
198+
amazonlinux-2023-3006: {extends: '.test_instance'}
199+
amazonlinux-2-3006: {extends: '.test_instance_failure_permitted'}
200+
centos-stream9-3006: {extends: '.test_instance'}
201+
debian-12-3006: {extends: '.test_instance'}
202+
debian-11-3006: {extends: '.test_instance'}
203+
fedora-41-3006: {extends: '.test_instance_failure_permitted'}
204+
fedora-40-3006: {extends: '.test_instance'}
205+
opensuse-leap-156-3006: {extends: '.test_instance'}
206+
opensuse-tmbl-latest-3006: {extends: '.test_instance'}
207+
oraclelinux-9-3006: {extends: '.test_instance'}
208+
oraclelinux-8-3006: {extends: '.test_instance'}
209+
rockylinux-9-3006: {extends: '.test_instance'}
210+
rockylinux-8-3006: {extends: '.test_instance'}
211+
ubuntu-2404-3006: {extends: '.test_instance'}
212+
ubuntu-2204-3006: {extends: '.test_instance'}
213+
ubuntu-2004-3006: {extends: '.test_instance'}
214214
# yamllint enable rule:line-length
215215

216216
###############################################################################

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ repos:
3030
- id: commitlint
3131
- id: commitlint-ci
3232
- repo: https://github.com/rubocop-hq/rubocop
33-
rev: v1.80.1
33+
rev: v1.81.7
3434
hooks:
3535
- id: rubocop
3636
name: Check Ruby files with rubocop
@@ -100,12 +100,12 @@ repos:
100100
)$
101101
additional_dependencies: [pygments==2.16.1]
102102
- repo: https://github.com/renovatebot/pre-commit-hooks
103-
rev: 41.93.2
103+
rev: 42.29.5
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.33.3
108+
rev: 0.35.0
109109
hooks:
110110
- id: check-github-workflows
111111
name: Check GitHub workflows with check-jsonschema

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ gem 'inspec', git: 'https://gitlab.com/saltstack-formulas/infrastructure/inspec'
1212
# improvement: avoid package installations which are already covered by the
1313
# `salt-image-builder` (i.e. the pre-salted images that we're using)
1414
# rubocop:disable Layout/LineLength
15-
gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf'
15+
gem 'kitchen-docker', git: 'https://github.com/test-kitchen/kitchen-docker', ref: '511e4ad36856b9e2eccceb56603586e6cebd296a'
1616
# rubocop:enable Layout/LineLength
1717

1818
gem 'kitchen-inspec', '3.0.0'
@@ -21,4 +21,4 @@ gem 'kitchen-salt', '0.7.2'
2121
# Avoid the error 'pkeys are immutable on OpenSSL 3.0'
2222
gem 'net-ssh', '>= 7.0.0'
2323

24-
gem 'test-kitchen', '3.7.0'
24+
gem 'test-kitchen', '3.9.0'

Gemfile.lock

Lines changed: 43 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
GIT
2+
remote: https://github.com/test-kitchen/kitchen-docker
3+
revision: 511e4ad36856b9e2eccceb56603586e6cebd296a
4+
ref: 511e4ad36856b9e2eccceb56603586e6cebd296a
5+
specs:
6+
kitchen-docker (3.0.0)
7+
test-kitchen (>= 1.0.0, < 4.0)
8+
19
GIT
210
remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
311
revision: a0c6295303f7d7a4d2a6164b5e77868560b04945
@@ -40,14 +48,6 @@ GIT
4048
tty-prompt (~> 0.17)
4149
tty-table (~> 0.10)
4250

43-
GIT
44-
remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker
45-
revision: 104079a1d2fe34f5b076f4d316f6f837fa76e412
46-
branch: ssf
47-
specs:
48-
kitchen-docker (2.13.0)
49-
test-kitchen (>= 1.0.0)
50-
5151
GEM
5252
remote: https://rubygems.org/
5353
specs:
@@ -322,13 +322,14 @@ GEM
322322
ms_rest_azure (~> 0.12.0)
323323
azure_mgmt_storage (0.23.0)
324324
ms_rest_azure (~> 0.12.0)
325-
base64 (0.2.0)
325+
base64 (0.3.0)
326326
bcrypt_pbkdf (1.1.1)
327327
bcrypt_pbkdf (1.1.1-x64-mingw-ucrt)
328328
benchmark (0.4.0)
329-
bigdecimal (3.1.9)
329+
bigdecimal (3.3.1)
330330
bson (4.15.0)
331331
builder (3.3.0)
332+
cgi (0.5.0)
332333
chef-config (18.7.6)
333334
addressable
334335
chef-utils (= 18.7.6)
@@ -369,6 +370,8 @@ GEM
369370
connection_pool (2.5.3)
370371
cookstyle (8.1.2)
371372
rubocop (= 1.75.5)
373+
csv (3.3.5)
374+
date (3.5.0)
372375
declarative (0.0.20)
373376
diff-lcs (1.6.2)
374377
docker-api (2.4.0)
@@ -377,6 +380,8 @@ GEM
377380
domain_name (0.6.20240107)
378381
drb (2.2.1)
379382
ed25519 (1.4.0)
383+
erb (4.0.4)
384+
cgi (>= 0.3.3)
380385
erubi (1.13.1)
381386
excon (1.2.5)
382387
logger
@@ -459,6 +464,10 @@ GEM
459464
concurrent-ruby (~> 1.0)
460465
inifile (3.0.0)
461466
io-console (0.8.0)
467+
irb (1.15.3)
468+
pp (>= 0.6.0)
469+
rdoc (>= 4.0.0)
470+
reline (>= 0.4.2)
462471
jmespath (1.6.2)
463472
json (2.12.0)
464473
jwt (2.10.1)
@@ -513,7 +522,7 @@ GEM
513522
faraday (>= 0.9, < 2.0.0)
514523
faraday-cookie_jar (~> 0.0.6)
515524
ms_rest (~> 0.7.6)
516-
multi_json (1.15.0)
525+
multi_json (1.17.0)
517526
multipart-post (2.4.1)
518527
mutex_m (0.3.0)
519528
net-scp (4.1.0)
@@ -530,24 +539,35 @@ GEM
530539
bigdecimal
531540
options (2.3.2)
532541
os (1.1.4)
542+
ostruct (0.6.3)
533543
parallel (1.27.0)
534544
parser (3.3.8.0)
535545
ast (~> 2.4.1)
536546
racc
537547
parslet (1.8.2)
538548
pastel (0.8.0)
539549
tty-color (~> 0.5)
550+
pp (0.6.3)
551+
prettyprint
552+
prettyprint (0.2.0)
540553
prism (1.4.0)
541554
progress_bar (1.3.4)
542555
highline (>= 1.6)
543556
options (~> 2.3.0)
544557
pry (0.15.2)
545558
coderay (~> 1.1)
546559
method_source (~> 1.0)
560+
psych (5.2.6)
561+
date
562+
stringio
547563
public_suffix (6.0.2)
548564
racc (1.8.1)
549565
rainbow (3.1.1)
550566
rake (13.2.1)
567+
rdoc (6.16.1)
568+
erb
569+
psych (>= 4.0.0)
570+
tsort
551571
regexp_parser (2.10.0)
552572
reline (0.6.1)
553573
io-console (~> 0.5)
@@ -556,7 +576,7 @@ GEM
556576
trailblazer-option (>= 0.1.1, < 0.2.0)
557577
uber (< 0.2.0)
558578
retriable (3.1.2)
559-
rexml (3.4.1)
579+
rexml (3.4.4)
560580
roo (2.9.0)
561581
nokogiri (~> 1)
562582
rubyzip (>= 1.3.0, < 3.0.0)
@@ -612,21 +632,28 @@ GEM
612632
logger
613633
ruby-ole
614634
sslshake (1.3.1)
635+
stringio (3.1.8)
615636
strings (0.2.1)
616637
strings-ansi (~> 0.2)
617638
unicode-display_width (>= 1.5, < 3.0)
618639
unicode_utils (~> 1.4)
619640
strings-ansi (0.2.0)
620-
test-kitchen (3.7.0)
641+
syslog (0.3.0)
642+
logger
643+
test-kitchen (3.9.0)
621644
bcrypt_pbkdf (~> 1.0)
622645
chef-utils (>= 16.4.35)
623-
ed25519 (~> 1.2)
646+
csv (~> 3.3)
647+
ed25519 (~> 1.3)
648+
irb (~> 1.15)
624649
license-acceptance (>= 1.0.11, < 3.0)
625650
mixlib-install (~> 3.6)
626651
mixlib-shellout (>= 1.2, < 4.0)
627652
net-scp (>= 1.1, < 5.0)
628653
net-ssh (>= 2.9, < 8.0)
629654
net-ssh-gateway (>= 1.2, < 3.0)
655+
ostruct (~> 0.6)
656+
syslog (~> 0.3)
630657
thor (>= 0.19, < 2.0)
631658
winrm (~> 2.0)
632659
winrm-elevated (~> 1.0)
@@ -747,6 +774,7 @@ GEM
747774
chef-winrm (~> 2.3.12)
748775
chef-winrm-elevated (~> 1.2.5)
749776
chef-winrm-fs (~> 1.3.7)
777+
tsort (0.2.0)
750778
tty-box (0.7.0)
751779
pastel (~> 0.8)
752780
strings (~> 0.2.0)
@@ -804,7 +832,7 @@ DEPENDENCIES
804832
kitchen-inspec (= 3.0.0)
805833
kitchen-salt (= 0.7.2)
806834
net-ssh (>= 7.0.0)
807-
test-kitchen (= 3.7.0)
835+
test-kitchen (= 3.9.0)
808836

809837
BUNDLED WITH
810838
2.3.7

0 commit comments

Comments
 (0)