Skip to content

Commit b310c79

Browse files
dafyddjdafyddj
authored
Merge pull request #43 from saltstack-formulas/renovate/https-github.com-dafyddj-copier-ssf-ci-2.x
chore(copier): update template https://github.com/dafyddj/copier-ssf-ci to v2.8.0
2 parents 7079387 + 7b66ba5 commit b310c79

File tree

5 files changed

+124
-125
lines changed

5 files changed

+124
-125
lines changed

‎.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.7.3
2+
_commit: v2.8.0
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 & 5 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.2@sha256:af1cccdd8afe64bbeac5216e3c243e2c3f716f665edf8487a9e920cbfb85c1fb
28+
container: techneg/ci-pre-commit:v2.5.5@sha256:9d92b83a64378da3f9363668b0da244d9f12039d86579881d649ddb40ce261f3
2929
runs-on: ubuntu-latest
3030
timeout-minutes: 10
3131
steps:
@@ -46,11 +46,10 @@ jobs:
4646
restore-keys: |
4747
${{ env.CI_CACHE_ID }}|
4848
- name: Build cache
49-
shell: bash
5049
run: |
5150
pre-commit gc
52-
echo "Installing hook environments"
53-
time pre-commit install-hooks
51+
echo "Installing hook environments..."
52+
time -f "Hook installation took %E" pre-commit install-hooks
5453
- name: Run `pre-commit`
5554
run: |
5655
pre-commit run --all-files --color always --verbose
@@ -62,7 +61,7 @@ jobs:
6261
issues: write
6362
pull-requests: write
6463
checks: read
65-
container: techneg/ci-semantic-release:v1.2.1@sha256:d23338a31ae979a4d15b9b4c68c3dea0795210956d2c43dc6eab1791483b7607
64+
container: techneg/ci-semantic-release:v1.2.4@sha256:e7cfe36054a56382568c0824d2539a67a956711d7b674093db320815e928ee27
6665
runs-on: ubuntu-latest
6766
timeout-minutes: 15
6867
steps:

‎.gitlab-ci.yml‎

Lines changed: 42 additions & 42 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.100@sha256:cdcfb678d97a38dc1bdb7010935e5e7e6515131812c76c32a78307860bf8193e'
19-
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.69@sha256:73b50339c27f37232edd5442ed02578dcca653bbac3c7335f6ccd576b5bbadf3'
20-
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.69@sha256:73b50339c27f37232edd5442ed02578dcca653bbac3c7335f6ccd576b5bbadf3'
21-
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.5.2@sha256:af1cccdd8afe64bbeac5216e3c243e2c3f716f665edf8487a9e920cbfb85c1fb'
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'
2222
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:fe69f9642c7edde46bbd78326d2c42c6e13fc73694efb142e92e206725479328'
23-
image_semantic-release: &image_semanticrelease 'techneg/ci-semantic-release:v1.2.1@sha256:d23338a31ae979a4d15b9b4c68c3dea0795210956d2c43dc6eab1791483b7607'
23+
image_semantic-release: &image_semanticrelease 'techneg/ci-semantic-release:v1.2.4@sha256:e7cfe36054a56382568c0824d2539a67a956711d7b674093db320815e928ee27'
2424
# `services`
2525
services_docker_dind: &services_docker_dind
26-
- 'docker:28.3.3-dind@sha256:c0872aae4791ff427e6eda52769afa04f17b5cf756f8267e0d52774c99d5c9de'
26+
- 'docker:28.3.3-dind@sha256:a56b3bdde89315ed2cc0e4906e582b5033d93bf20d9cb9510c2cdd4e7f7690b1'
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-6: {extends: '.test_instance_failure_permitted'}
179-
almalinux-8-3007-6: {extends: '.test_instance_failure_permitted'}
180-
amazonlinux-2023-3007-6: {extends: '.test_instance_failure_permitted'}
181-
amazonlinux-2-3007-6: {extends: '.test_instance_failure_permitted'}
182-
centos-stream9-3007-6: {extends: '.test_instance_failure_permitted'}
183-
debian-12-3007-6: {extends: '.test_instance'}
184-
debian-11-3007-6: {extends: '.test_instance'}
185-
fedora-41-3007-6: {extends: '.test_instance_failure_permitted'}
186-
fedora-40-3007-6: {extends: '.test_instance'}
187-
opensuse-leap-156-3007-6: {extends: '.test_instance'}
188-
opensuse-tmbl-latest-3007-6: {extends: '.test_instance'}
189-
oraclelinux-9-3007-6: {extends: '.test_instance_failure_permitted'}
190-
oraclelinux-8-3007-6: {extends: '.test_instance_failure_permitted'}
191-
rockylinux-9-3007-6: {extends: '.test_instance_failure_permitted'}
192-
rockylinux-8-3007-6: {extends: '.test_instance_failure_permitted'}
193-
ubuntu-2404-3007-6: {extends: '.test_instance'}
194-
ubuntu-2204-3007-6: {extends: '.test_instance'}
195-
ubuntu-2004-3007-6: {extends: '.test_instance'}
196-
almalinux-9-3006-14: {extends: '.test_instance_failure_permitted'}
197-
almalinux-8-3006-14: {extends: '.test_instance_failure_permitted'}
198-
amazonlinux-2023-3006-14: {extends: '.test_instance_failure_permitted'}
199-
amazonlinux-2-3006-14: {extends: '.test_instance_failure_permitted'}
200-
centos-stream9-3006-14: {extends: '.test_instance_failure_permitted'}
201-
debian-12-3006-14: {extends: '.test_instance'}
202-
debian-11-3006-14: {extends: '.test_instance'}
203-
fedora-41-3006-14: {extends: '.test_instance_failure_permitted'}
204-
fedora-40-3006-14: {extends: '.test_instance'}
205-
opensuse-leap-156-3006-14: {extends: '.test_instance'}
206-
opensuse-tmbl-latest-3006-14: {extends: '.test_instance'}
207-
oraclelinux-9-3006-14: {extends: '.test_instance_failure_permitted'}
208-
oraclelinux-8-3006-14: {extends: '.test_instance_failure_permitted'}
209-
rockylinux-9-3006-14: {extends: '.test_instance_failure_permitted'}
210-
rockylinux-8-3006-14: {extends: '.test_instance_failure_permitted'}
211-
ubuntu-2404-3006-14: {extends: '.test_instance'}
212-
ubuntu-2204-3006-14: {extends: '.test_instance'}
213-
ubuntu-2004-3006-14: {extends: '.test_instance'}
178+
almalinux-9-3007-7: {extends: '.test_instance_failure_permitted'}
179+
almalinux-8-3007-7: {extends: '.test_instance_failure_permitted'}
180+
amazonlinux-2023-3007-7: {extends: '.test_instance_failure_permitted'}
181+
amazonlinux-2-3007-7: {extends: '.test_instance_failure_permitted'}
182+
centos-stream9-3007-7: {extends: '.test_instance_failure_permitted'}
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_failure_permitted'}
190+
oraclelinux-8-3007-7: {extends: '.test_instance_failure_permitted'}
191+
rockylinux-9-3007-7: {extends: '.test_instance_failure_permitted'}
192+
rockylinux-8-3007-7: {extends: '.test_instance_failure_permitted'}
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_failure_permitted'}
197+
almalinux-8-3006-15: {extends: '.test_instance_failure_permitted'}
198+
amazonlinux-2023-3006-15: {extends: '.test_instance_failure_permitted'}
199+
amazonlinux-2-3006-15: {extends: '.test_instance_failure_permitted'}
200+
centos-stream9-3006-15: {extends: '.test_instance_failure_permitted'}
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_failure_permitted'}
208+
oraclelinux-8-3006-15: {extends: '.test_instance_failure_permitted'}
209+
rockylinux-9-3006-15: {extends: '.test_instance_failure_permitted'}
210+
rockylinux-8-3006-15: {extends: '.test_instance_failure_permitted'}
211+
ubuntu-2404-3006-15: {extends: '.test_instance'}
212+
ubuntu-2204-3006-15: {extends: '.test_instance'}
213+
ubuntu-2004-3006-15: {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.79.2
33+
rev: v1.80.1
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.63.0
103+
rev: 41.93.2
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.2
108+
rev: 0.33.3
109109
hooks:
110110
- id: check-github-workflows
111111
name: Check GitHub workflows with check-jsonschema

‎kitchen.yml‎

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -91,143 +91,143 @@ platforms:
9191
driver:
9292
image: saltimages/salt-master-py3:rockylinux-8
9393

94-
## SALT `3007.6`
95-
- name: debian-12-3007-6
94+
## SALT `3007.7`
95+
- name: debian-12-3007-7
9696
driver:
97-
image: saltimages/salt-3007.6-py3:debian-12
97+
image: saltimages/salt-3007.7-py3:debian-12
9898
run_command: /lib/systemd/systemd
99-
- name: debian-11-3007-6
99+
- name: debian-11-3007-7
100100
driver:
101-
image: saltimages/salt-3007.6-py3:debian-11
101+
image: saltimages/salt-3007.7-py3:debian-11
102102
run_command: /lib/systemd/systemd
103-
- name: ubuntu-2404-3007-6
103+
- name: ubuntu-2404-3007-7
104104
driver:
105-
image: saltimages/salt-3007.6-py3:ubuntu-24.04
105+
image: saltimages/salt-3007.7-py3:ubuntu-24.04
106106
run_command: /lib/systemd/systemd
107-
- name: ubuntu-2204-3007-6
107+
- name: ubuntu-2204-3007-7
108108
driver:
109-
image: saltimages/salt-3007.6-py3:ubuntu-22.04
109+
image: saltimages/salt-3007.7-py3:ubuntu-22.04
110110
run_command: /lib/systemd/systemd
111-
- name: ubuntu-2004-3007-6
111+
- name: ubuntu-2004-3007-7
112112
driver:
113-
image: saltimages/salt-3007.6-py3:ubuntu-20.04
113+
image: saltimages/salt-3007.7-py3:ubuntu-20.04
114114
run_command: /lib/systemd/systemd
115-
- name: centos-stream9-3007-6
115+
- name: centos-stream9-3007-7
116116
driver:
117-
image: saltimages/salt-3007.6-py3:centos-stream9
118-
- name: opensuse-leap-156-3007-6
117+
image: saltimages/salt-3007.7-py3:centos-stream9
118+
- name: opensuse-leap-156-3007-7
119119
driver:
120-
image: saltimages/salt-3007.6-py3:opensuse-leap-15.6
120+
image: saltimages/salt-3007.7-py3:opensuse-leap-15.6
121121
# Workaround to avoid intermittent failures on `opensuse-leap-15.6`:
122122
# => SCP did not finish successfully (255): (Net::SCP::Error)
123123
transport:
124124
max_ssh_sessions: 1
125-
- name: opensuse-tmbl-latest-3007-6
125+
- name: opensuse-tmbl-latest-3007-7
126126
driver:
127-
image: saltimages/salt-3007.6-py3:opensuse-tumbleweed-latest
127+
image: saltimages/salt-3007.7-py3:opensuse-tumbleweed-latest
128128
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
129129
# => SCP did not finish successfully (255): (Net::SCP::Error)
130130
transport:
131131
max_ssh_sessions: 1
132-
- name: fedora-41-3007-6
132+
- name: fedora-41-3007-7
133133
driver:
134-
image: saltimages/salt-3007.6-py3:fedora-41
135-
- name: fedora-40-3007-6
134+
image: saltimages/salt-3007.7-py3:fedora-41
135+
- name: fedora-40-3007-7
136136
driver:
137-
image: saltimages/salt-3007.6-py3:fedora-40
138-
- name: amazonlinux-2023-3007-6
137+
image: saltimages/salt-3007.7-py3:fedora-40
138+
- name: amazonlinux-2023-3007-7
139139
driver:
140-
image: saltimages/salt-3007.6-py3:amazonlinux-2023
141-
- name: amazonlinux-2-3007-6
140+
image: saltimages/salt-3007.7-py3:amazonlinux-2023
141+
- name: amazonlinux-2-3007-7
142142
driver:
143-
image: saltimages/salt-3007.6-py3:amazonlinux-2
144-
- name: oraclelinux-9-3007-6
143+
image: saltimages/salt-3007.7-py3:amazonlinux-2
144+
- name: oraclelinux-9-3007-7
145145
driver:
146-
image: saltimages/salt-3007.6-py3:oraclelinux-9
147-
- name: oraclelinux-8-3007-6
146+
image: saltimages/salt-3007.7-py3:oraclelinux-9
147+
- name: oraclelinux-8-3007-7
148148
driver:
149-
image: saltimages/salt-3007.6-py3:oraclelinux-8
150-
- name: almalinux-9-3007-6
149+
image: saltimages/salt-3007.7-py3:oraclelinux-8
150+
- name: almalinux-9-3007-7
151151
driver:
152-
image: saltimages/salt-3007.6-py3:almalinux-9
153-
- name: almalinux-8-3007-6
152+
image: saltimages/salt-3007.7-py3:almalinux-9
153+
- name: almalinux-8-3007-7
154154
driver:
155-
image: saltimages/salt-3007.6-py3:almalinux-8
156-
- name: rockylinux-9-3007-6
155+
image: saltimages/salt-3007.7-py3:almalinux-8
156+
- name: rockylinux-9-3007-7
157157
driver:
158-
image: saltimages/salt-3007.6-py3:rockylinux-9
159-
- name: rockylinux-8-3007-6
158+
image: saltimages/salt-3007.7-py3:rockylinux-9
159+
- name: rockylinux-8-3007-7
160160
driver:
161-
image: saltimages/salt-3007.6-py3:rockylinux-8
161+
image: saltimages/salt-3007.7-py3:rockylinux-8
162162

163-
## SALT `3006.14`
164-
- name: debian-12-3006-14
163+
## SALT `3006.15`
164+
- name: debian-12-3006-15
165165
driver:
166-
image: saltimages/salt-3006.14-py3:debian-12
166+
image: saltimages/salt-3006.15-py3:debian-12
167167
run_command: /lib/systemd/systemd
168-
- name: debian-11-3006-14
168+
- name: debian-11-3006-15
169169
driver:
170-
image: saltimages/salt-3006.14-py3:debian-11
170+
image: saltimages/salt-3006.15-py3:debian-11
171171
run_command: /lib/systemd/systemd
172-
- name: ubuntu-2404-3006-14
172+
- name: ubuntu-2404-3006-15
173173
driver:
174-
image: saltimages/salt-3006.14-py3:ubuntu-24.04
174+
image: saltimages/salt-3006.15-py3:ubuntu-24.04
175175
run_command: /lib/systemd/systemd
176-
- name: ubuntu-2204-3006-14
176+
- name: ubuntu-2204-3006-15
177177
driver:
178-
image: saltimages/salt-3006.14-py3:ubuntu-22.04
178+
image: saltimages/salt-3006.15-py3:ubuntu-22.04
179179
run_command: /lib/systemd/systemd
180-
- name: ubuntu-2004-3006-14
180+
- name: ubuntu-2004-3006-15
181181
driver:
182-
image: saltimages/salt-3006.14-py3:ubuntu-20.04
182+
image: saltimages/salt-3006.15-py3:ubuntu-20.04
183183
run_command: /lib/systemd/systemd
184-
- name: centos-stream9-3006-14
184+
- name: centos-stream9-3006-15
185185
driver:
186-
image: saltimages/salt-3006.14-py3:centos-stream9
187-
- name: opensuse-tmbl-latest-3006-14
186+
image: saltimages/salt-3006.15-py3:centos-stream9
187+
- name: opensuse-tmbl-latest-3006-15
188188
driver:
189-
image: saltimages/salt-3006.14-py3:opensuse-tumbleweed-latest
189+
image: saltimages/salt-3006.15-py3:opensuse-tumbleweed-latest
190190
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
191191
# => SCP did not finish successfully (255): (Net::SCP::Error)
192192
transport:
193193
max_ssh_sessions: 1
194-
- name: opensuse-leap-156-3006-14
194+
- name: opensuse-leap-156-3006-15
195195
driver:
196-
image: saltimages/salt-3006.14-py3:opensuse-leap-15.6
196+
image: saltimages/salt-3006.15-py3:opensuse-leap-15.6
197197
# Workaround to avoid intermittent failures on `opensuse-leap-15.6`:
198198
# => SCP did not finish successfully (255): (Net::SCP::Error)
199199
transport:
200200
max_ssh_sessions: 1
201-
- name: fedora-41-3006-14
201+
- name: fedora-41-3006-15
202202
driver:
203-
image: saltimages/salt-3006.14-py3:fedora-41
204-
- name: fedora-40-3006-14
203+
image: saltimages/salt-3006.15-py3:fedora-41
204+
- name: fedora-40-3006-15
205205
driver:
206-
image: saltimages/salt-3006.14-py3:fedora-40
207-
- name: amazonlinux-2023-3006-14
206+
image: saltimages/salt-3006.15-py3:fedora-40
207+
- name: amazonlinux-2023-3006-15
208208
driver:
209-
image: saltimages/salt-3006.14-py3:amazonlinux-2023
210-
- name: amazonlinux-2-3006-14
209+
image: saltimages/salt-3006.15-py3:amazonlinux-2023
210+
- name: amazonlinux-2-3006-15
211211
driver:
212-
image: saltimages/salt-3006.14-py3:amazonlinux-2
213-
- name: oraclelinux-9-3006-14
212+
image: saltimages/salt-3006.15-py3:amazonlinux-2
213+
- name: oraclelinux-9-3006-15
214214
driver:
215-
image: saltimages/salt-3006.14-py3:oraclelinux-9
216-
- name: oraclelinux-8-3006-14
215+
image: saltimages/salt-3006.15-py3:oraclelinux-9
216+
- name: oraclelinux-8-3006-15
217217
driver:
218-
image: saltimages/salt-3006.14-py3:oraclelinux-8
219-
- name: almalinux-9-3006-14
218+
image: saltimages/salt-3006.15-py3:oraclelinux-8
219+
- name: almalinux-9-3006-15
220220
driver:
221-
image: saltimages/salt-3006.14-py3:almalinux-9
222-
- name: almalinux-8-3006-14
221+
image: saltimages/salt-3006.15-py3:almalinux-9
222+
- name: almalinux-8-3006-15
223223
driver:
224-
image: saltimages/salt-3006.14-py3:almalinux-8
225-
- name: rockylinux-9-3006-14
224+
image: saltimages/salt-3006.15-py3:almalinux-8
225+
- name: rockylinux-9-3006-15
226226
driver:
227-
image: saltimages/salt-3006.14-py3:rockylinux-9
228-
- name: rockylinux-8-3006-14
227+
image: saltimages/salt-3006.15-py3:rockylinux-9
228+
- name: rockylinux-8-3006-15
229229
driver:
230-
image: saltimages/salt-3006.14-py3:rockylinux-8
230+
image: saltimages/salt-3006.15-py3:rockylinux-8
231231

232232
##########################################################
233233
# This file is managed as part of a Copier template. #

0 commit comments

Comments
 (0)