Skip to content

Commit 67ed428

Browse files
dafyddjdafyddj
authored
Merge pull request #91 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.5.0
2 parents d9b9e19 + 6c83586 commit 67ed428

File tree

5 files changed

+130
-130
lines changed

5 files changed

+130
-130
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.4.0
2+
_commit: v2.5.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: 11 additions & 11 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.4.28@sha256:3a5b362f2fdf60e3a6c614a919c67cc8ae5d34208e287d293fc30c150a919ac6
28+
container: techneg/ci-pre-commit:v2.4.30@sha256:0d36fff14826b86f7248742a0e8f1d4b4d2341ebb9442dfe1d9c2491b63f3209
2929
runs-on: ubuntu-latest
3030
timeout-minutes: 5
3131
steps:
@@ -72,16 +72,16 @@ jobs:
7272
- ubuntu-2404-master
7373
- ubuntu-2204-master
7474
- ubuntu-2004-master
75-
- debian-12-3007-5
76-
- debian-11-3007-5
77-
- ubuntu-2404-3007-5
78-
- ubuntu-2204-3007-5
79-
- ubuntu-2004-3007-5
80-
- debian-12-3006-13
81-
- debian-11-3006-13
82-
- ubuntu-2404-3006-13
83-
- ubuntu-2204-3006-13
84-
- ubuntu-2004-3006-13
75+
- debian-12-3007-6
76+
- debian-11-3007-6
77+
- ubuntu-2404-3007-6
78+
- ubuntu-2204-3007-6
79+
- ubuntu-2004-3007-6
80+
- debian-12-3006-14
81+
- debian-11-3006-14
82+
- ubuntu-2404-3006-14
83+
- ubuntu-2204-3006-14
84+
- ubuntu-2004-3006-14
8585
steps:
8686
- name: Debug on runner (When re-run with "Enable debug logging" checked)
8787
if: runner.debug

‎.gitlab-ci.yml‎

Lines changed: 41 additions & 41 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.94@sha256:3913ba70632c591b1accf8f65324008cfcbfb231e03a34908dd92022b3cd9fe4'
19-
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.63@sha256:d2dd81049d7c0c8e369c744d57824685ae089403c53b1c767d9cfe1c691d9327'
20-
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.63@sha256:d2dd81049d7c0c8e369c744d57824685ae089403c53b1c767d9cfe1c691d9327'
21-
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.28@sha256:3a5b362f2fdf60e3a6c614a919c67cc8ae5d34208e287d293fc30c150a919ac6'
18+
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.96@sha256:ff46355998543c81a386584d753d208e7526c282b82b0c9ca2225159f388b828'
19+
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.65@sha256:64753d90107a81f93ef1827d81f544b689165a9e5efc7494976bb6e11b8bbcc1'
20+
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.65@sha256:64753d90107a81f93ef1827d81f544b689165a9e5efc7494976bb6e11b8bbcc1'
21+
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.30@sha256:0d36fff14826b86f7248742a0e8f1d4b4d2341ebb9442dfe1d9c2491b63f3209'
2222
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:fe69f9642c7edde46bbd78326d2c42c6e13fc73694efb142e92e206725479328'
2323
image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14@sha256:374f588420087517a3cc0235e11293bffd72d7a59da3d98d5e69f014ff2a7761'
2424
# `services`
2525
services_docker_dind: &services_docker_dind
26-
- 'docker:28.3.0-dind@sha256:d33eb93fe02683e984e6f8a93c0b3d85bb74f56ec83922bc39fb34ba23ab42bc'
26+
- 'docker:28.3.2-dind@sha256:684bc226a69eb91582738f196e59e234355420ee592abea7685e4127afbce645'
2727
# yamllint enable rule:line-length
2828
# `variables`
2929
# https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3
@@ -184,42 +184,42 @@ rockylinux-8-master: {extends: '.test_instance_failure_permitted'}
184184
ubuntu-2404-master: {extends: '.test_instance_failure_permitted'}
185185
ubuntu-2204-master: {extends: '.test_instance_failure_permitted'}
186186
ubuntu-2004-master: {extends: '.test_instance_failure_permitted'}
187-
almalinux-9-3007-5: {extends: '.test_instance'}
188-
almalinux-8-3007-5: {extends: '.test_instance'}
189-
amazonlinux-2023-3007-5: {extends: '.test_instance'}
190-
amazonlinux-2-3007-5: {extends: '.test_instance_failure_permitted'}
191-
centos-stream9-3007-5: {extends: '.test_instance'}
192-
debian-12-3007-5: {extends: '.test_instance'}
193-
debian-11-3007-5: {extends: '.test_instance'}
194-
fedora-41-3007-5: {extends: '.test_instance_failure_permitted'}
195-
fedora-40-3007-5: {extends: '.test_instance'}
196-
opensuse-leap-156-3007-5: {extends: '.test_instance'}
197-
opensuse-tmbl-latest-3007-5: {extends: '.test_instance'}
198-
oraclelinux-9-3007-5: {extends: '.test_instance'}
199-
oraclelinux-8-3007-5: {extends: '.test_instance'}
200-
rockylinux-9-3007-5: {extends: '.test_instance'}
201-
rockylinux-8-3007-5: {extends: '.test_instance'}
202-
ubuntu-2404-3007-5: {extends: '.test_instance'}
203-
ubuntu-2204-3007-5: {extends: '.test_instance'}
204-
ubuntu-2004-3007-5: {extends: '.test_instance'}
205-
almalinux-9-3006-13: {extends: '.test_instance'}
206-
almalinux-8-3006-13: {extends: '.test_instance'}
207-
amazonlinux-2023-3006-13: {extends: '.test_instance'}
208-
amazonlinux-2-3006-13: {extends: '.test_instance_failure_permitted'}
209-
centos-stream9-3006-13: {extends: '.test_instance'}
210-
debian-12-3006-13: {extends: '.test_instance'}
211-
debian-11-3006-13: {extends: '.test_instance'}
212-
fedora-41-3006-13: {extends: '.test_instance_failure_permitted'}
213-
fedora-40-3006-13: {extends: '.test_instance'}
214-
opensuse-leap-156-3006-13: {extends: '.test_instance'}
215-
opensuse-tmbl-latest-3006-13: {extends: '.test_instance'}
216-
oraclelinux-9-3006-13: {extends: '.test_instance'}
217-
oraclelinux-8-3006-13: {extends: '.test_instance'}
218-
rockylinux-9-3006-13: {extends: '.test_instance'}
219-
rockylinux-8-3006-13: {extends: '.test_instance'}
220-
ubuntu-2404-3006-13: {extends: '.test_instance'}
221-
ubuntu-2204-3006-13: {extends: '.test_instance'}
222-
ubuntu-2004-3006-13: {extends: '.test_instance'}
187+
almalinux-9-3007-6: {extends: '.test_instance'}
188+
almalinux-8-3007-6: {extends: '.test_instance'}
189+
amazonlinux-2023-3007-6: {extends: '.test_instance'}
190+
amazonlinux-2-3007-6: {extends: '.test_instance_failure_permitted'}
191+
centos-stream9-3007-6: {extends: '.test_instance'}
192+
debian-12-3007-6: {extends: '.test_instance'}
193+
debian-11-3007-6: {extends: '.test_instance'}
194+
fedora-41-3007-6: {extends: '.test_instance_failure_permitted'}
195+
fedora-40-3007-6: {extends: '.test_instance'}
196+
opensuse-leap-156-3007-6: {extends: '.test_instance'}
197+
opensuse-tmbl-latest-3007-6: {extends: '.test_instance'}
198+
oraclelinux-9-3007-6: {extends: '.test_instance'}
199+
oraclelinux-8-3007-6: {extends: '.test_instance'}
200+
rockylinux-9-3007-6: {extends: '.test_instance'}
201+
rockylinux-8-3007-6: {extends: '.test_instance'}
202+
ubuntu-2404-3007-6: {extends: '.test_instance'}
203+
ubuntu-2204-3007-6: {extends: '.test_instance'}
204+
ubuntu-2004-3007-6: {extends: '.test_instance'}
205+
almalinux-9-3006-14: {extends: '.test_instance'}
206+
almalinux-8-3006-14: {extends: '.test_instance'}
207+
amazonlinux-2023-3006-14: {extends: '.test_instance'}
208+
amazonlinux-2-3006-14: {extends: '.test_instance_failure_permitted'}
209+
centos-stream9-3006-14: {extends: '.test_instance'}
210+
debian-12-3006-14: {extends: '.test_instance'}
211+
debian-11-3006-14: {extends: '.test_instance'}
212+
fedora-41-3006-14: {extends: '.test_instance_failure_permitted'}
213+
fedora-40-3006-14: {extends: '.test_instance'}
214+
opensuse-leap-156-3006-14: {extends: '.test_instance'}
215+
opensuse-tmbl-latest-3006-14: {extends: '.test_instance'}
216+
oraclelinux-9-3006-14: {extends: '.test_instance'}
217+
oraclelinux-8-3006-14: {extends: '.test_instance'}
218+
rockylinux-9-3006-14: {extends: '.test_instance'}
219+
rockylinux-8-3006-14: {extends: '.test_instance'}
220+
ubuntu-2404-3006-14: {extends: '.test_instance'}
221+
ubuntu-2204-3006-14: {extends: '.test_instance'}
222+
ubuntu-2004-3006-14: {extends: '.test_instance'}
223223
# yamllint enable rule:line-length
224224

225225
###############################################################################

‎.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.77.0
33+
rev: v1.78.0
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: 40.62.1
103+
rev: 41.23.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.1
108+
rev: 0.33.2
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
@@ -89,143 +89,143 @@ platforms:
8989
driver:
9090
image: saltimages/salt-master-py3:rockylinux-8
9191

92-
## SALT `3007.5`
93-
- name: debian-12-3007-5
92+
## SALT `3007.6`
93+
- name: debian-12-3007-6
9494
driver:
95-
image: saltimages/salt-3007.5-py3:debian-12
95+
image: saltimages/salt-3007.6-py3:debian-12
9696
run_command: /lib/systemd/systemd
97-
- name: debian-11-3007-5
97+
- name: debian-11-3007-6
9898
driver:
99-
image: saltimages/salt-3007.5-py3:debian-11
99+
image: saltimages/salt-3007.6-py3:debian-11
100100
run_command: /lib/systemd/systemd
101-
- name: ubuntu-2404-3007-5
101+
- name: ubuntu-2404-3007-6
102102
driver:
103-
image: saltimages/salt-3007.5-py3:ubuntu-24.04
103+
image: saltimages/salt-3007.6-py3:ubuntu-24.04
104104
run_command: /lib/systemd/systemd
105-
- name: ubuntu-2204-3007-5
105+
- name: ubuntu-2204-3007-6
106106
driver:
107-
image: saltimages/salt-3007.5-py3:ubuntu-22.04
107+
image: saltimages/salt-3007.6-py3:ubuntu-22.04
108108
run_command: /lib/systemd/systemd
109-
- name: ubuntu-2004-3007-5
109+
- name: ubuntu-2004-3007-6
110110
driver:
111-
image: saltimages/salt-3007.5-py3:ubuntu-20.04
111+
image: saltimages/salt-3007.6-py3:ubuntu-20.04
112112
run_command: /lib/systemd/systemd
113-
- name: centos-stream9-3007-5
113+
- name: centos-stream9-3007-6
114114
driver:
115-
image: saltimages/salt-3007.5-py3:centos-stream9
116-
- name: opensuse-leap-156-3007-5
115+
image: saltimages/salt-3007.6-py3:centos-stream9
116+
- name: opensuse-leap-156-3007-6
117117
driver:
118-
image: saltimages/salt-3007.5-py3:opensuse-leap-15.6
118+
image: saltimages/salt-3007.6-py3:opensuse-leap-15.6
119119
# Workaround to avoid intermittent failures on `opensuse-leap-15.6`:
120120
# => SCP did not finish successfully (255): (Net::SCP::Error)
121121
transport:
122122
max_ssh_sessions: 1
123-
- name: opensuse-tmbl-latest-3007-5
123+
- name: opensuse-tmbl-latest-3007-6
124124
driver:
125-
image: saltimages/salt-3007.5-py3:opensuse-tumbleweed-latest
125+
image: saltimages/salt-3007.6-py3:opensuse-tumbleweed-latest
126126
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
127127
# => SCP did not finish successfully (255): (Net::SCP::Error)
128128
transport:
129129
max_ssh_sessions: 1
130-
- name: fedora-41-3007-5
130+
- name: fedora-41-3007-6
131131
driver:
132-
image: saltimages/salt-3007.5-py3:fedora-41
133-
- name: fedora-40-3007-5
132+
image: saltimages/salt-3007.6-py3:fedora-41
133+
- name: fedora-40-3007-6
134134
driver:
135-
image: saltimages/salt-3007.5-py3:fedora-40
136-
- name: amazonlinux-2023-3007-5
135+
image: saltimages/salt-3007.6-py3:fedora-40
136+
- name: amazonlinux-2023-3007-6
137137
driver:
138-
image: saltimages/salt-3007.5-py3:amazonlinux-2023
139-
- name: amazonlinux-2-3007-5
138+
image: saltimages/salt-3007.6-py3:amazonlinux-2023
139+
- name: amazonlinux-2-3007-6
140140
driver:
141-
image: saltimages/salt-3007.5-py3:amazonlinux-2
142-
- name: oraclelinux-9-3007-5
141+
image: saltimages/salt-3007.6-py3:amazonlinux-2
142+
- name: oraclelinux-9-3007-6
143143
driver:
144-
image: saltimages/salt-3007.5-py3:oraclelinux-9
145-
- name: oraclelinux-8-3007-5
144+
image: saltimages/salt-3007.6-py3:oraclelinux-9
145+
- name: oraclelinux-8-3007-6
146146
driver:
147-
image: saltimages/salt-3007.5-py3:oraclelinux-8
148-
- name: almalinux-9-3007-5
147+
image: saltimages/salt-3007.6-py3:oraclelinux-8
148+
- name: almalinux-9-3007-6
149149
driver:
150-
image: saltimages/salt-3007.5-py3:almalinux-9
151-
- name: almalinux-8-3007-5
150+
image: saltimages/salt-3007.6-py3:almalinux-9
151+
- name: almalinux-8-3007-6
152152
driver:
153-
image: saltimages/salt-3007.5-py3:almalinux-8
154-
- name: rockylinux-9-3007-5
153+
image: saltimages/salt-3007.6-py3:almalinux-8
154+
- name: rockylinux-9-3007-6
155155
driver:
156-
image: saltimages/salt-3007.5-py3:rockylinux-9
157-
- name: rockylinux-8-3007-5
156+
image: saltimages/salt-3007.6-py3:rockylinux-9
157+
- name: rockylinux-8-3007-6
158158
driver:
159-
image: saltimages/salt-3007.5-py3:rockylinux-8
159+
image: saltimages/salt-3007.6-py3:rockylinux-8
160160

161-
## SALT `3006.13`
162-
- name: debian-12-3006-13
161+
## SALT `3006.14`
162+
- name: debian-12-3006-14
163163
driver:
164-
image: saltimages/salt-3006.13-py3:debian-12
164+
image: saltimages/salt-3006.14-py3:debian-12
165165
run_command: /lib/systemd/systemd
166-
- name: debian-11-3006-13
166+
- name: debian-11-3006-14
167167
driver:
168-
image: saltimages/salt-3006.13-py3:debian-11
168+
image: saltimages/salt-3006.14-py3:debian-11
169169
run_command: /lib/systemd/systemd
170-
- name: ubuntu-2404-3006-13
170+
- name: ubuntu-2404-3006-14
171171
driver:
172-
image: saltimages/salt-3006.13-py3:ubuntu-24.04
172+
image: saltimages/salt-3006.14-py3:ubuntu-24.04
173173
run_command: /lib/systemd/systemd
174-
- name: ubuntu-2204-3006-13
174+
- name: ubuntu-2204-3006-14
175175
driver:
176-
image: saltimages/salt-3006.13-py3:ubuntu-22.04
176+
image: saltimages/salt-3006.14-py3:ubuntu-22.04
177177
run_command: /lib/systemd/systemd
178-
- name: ubuntu-2004-3006-13
178+
- name: ubuntu-2004-3006-14
179179
driver:
180-
image: saltimages/salt-3006.13-py3:ubuntu-20.04
180+
image: saltimages/salt-3006.14-py3:ubuntu-20.04
181181
run_command: /lib/systemd/systemd
182-
- name: centos-stream9-3006-13
182+
- name: centos-stream9-3006-14
183183
driver:
184-
image: saltimages/salt-3006.13-py3:centos-stream9
185-
- name: opensuse-tmbl-latest-3006-13
184+
image: saltimages/salt-3006.14-py3:centos-stream9
185+
- name: opensuse-tmbl-latest-3006-14
186186
driver:
187-
image: saltimages/salt-3006.13-py3:opensuse-tumbleweed-latest
187+
image: saltimages/salt-3006.14-py3:opensuse-tumbleweed-latest
188188
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
189189
# => SCP did not finish successfully (255): (Net::SCP::Error)
190190
transport:
191191
max_ssh_sessions: 1
192-
- name: opensuse-leap-156-3006-13
192+
- name: opensuse-leap-156-3006-14
193193
driver:
194-
image: saltimages/salt-3006.13-py3:opensuse-leap-15.6
194+
image: saltimages/salt-3006.14-py3:opensuse-leap-15.6
195195
# Workaround to avoid intermittent failures on `opensuse-leap-15.6`:
196196
# => SCP did not finish successfully (255): (Net::SCP::Error)
197197
transport:
198198
max_ssh_sessions: 1
199-
- name: fedora-41-3006-13
199+
- name: fedora-41-3006-14
200200
driver:
201-
image: saltimages/salt-3006.13-py3:fedora-41
202-
- name: fedora-40-3006-13
201+
image: saltimages/salt-3006.14-py3:fedora-41
202+
- name: fedora-40-3006-14
203203
driver:
204-
image: saltimages/salt-3006.13-py3:fedora-40
205-
- name: amazonlinux-2023-3006-13
204+
image: saltimages/salt-3006.14-py3:fedora-40
205+
- name: amazonlinux-2023-3006-14
206206
driver:
207-
image: saltimages/salt-3006.13-py3:amazonlinux-2023
208-
- name: amazonlinux-2-3006-13
207+
image: saltimages/salt-3006.14-py3:amazonlinux-2023
208+
- name: amazonlinux-2-3006-14
209209
driver:
210-
image: saltimages/salt-3006.13-py3:amazonlinux-2
211-
- name: oraclelinux-9-3006-13
210+
image: saltimages/salt-3006.14-py3:amazonlinux-2
211+
- name: oraclelinux-9-3006-14
212212
driver:
213-
image: saltimages/salt-3006.13-py3:oraclelinux-9
214-
- name: oraclelinux-8-3006-13
213+
image: saltimages/salt-3006.14-py3:oraclelinux-9
214+
- name: oraclelinux-8-3006-14
215215
driver:
216-
image: saltimages/salt-3006.13-py3:oraclelinux-8
217-
- name: almalinux-9-3006-13
216+
image: saltimages/salt-3006.14-py3:oraclelinux-8
217+
- name: almalinux-9-3006-14
218218
driver:
219-
image: saltimages/salt-3006.13-py3:almalinux-9
220-
- name: almalinux-8-3006-13
219+
image: saltimages/salt-3006.14-py3:almalinux-9
220+
- name: almalinux-8-3006-14
221221
driver:
222-
image: saltimages/salt-3006.13-py3:almalinux-8
223-
- name: rockylinux-9-3006-13
222+
image: saltimages/salt-3006.14-py3:almalinux-8
223+
- name: rockylinux-9-3006-14
224224
driver:
225-
image: saltimages/salt-3006.13-py3:rockylinux-9
226-
- name: rockylinux-8-3006-13
225+
image: saltimages/salt-3006.14-py3:rockylinux-9
226+
- name: rockylinux-8-3006-14
227227
driver:
228-
image: saltimages/salt-3006.13-py3:rockylinux-8
228+
image: saltimages/salt-3006.14-py3:rockylinux-8
229229

230230
##########################################################
231231
# This file is managed as part of a Copier template. #

0 commit comments

Comments
 (0)