Skip to content

Commit 61b4ca6

Browse files
authored
Merge pull request #75 from saltstack-formulas/renovate/https-github.com-dafyddj-copier-ssf-ci-1.x
chore(deps): update dependency https://github.com/dafyddj/copier-ssf-ci to v1.2.0
2 parents 4917f26 + 8bbb6c1 commit 61b4ca6

4 files changed

Lines changed: 110 additions & 140 deletions

File tree

.copier-answers.ssf-ci.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
2-
_commit: v1.1.9
2+
_commit: v1.2.0
33
_src_path: https://github.com/dafyddj/copier-ssf-ci
4+
failure_permitted_pattern: master
45
formula_name: vault
6+
supported_oses:
7+
- Debian
8+
- Rocky Linux
9+
- Ubuntu

.gitlab-ci.yml

Lines changed: 26 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
stage_test: &stage_test 'test'
1515
# `image`
1616
# yamllint disable rule:line-length
17-
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.87@sha256:7d88b7ea69f3cd917995d0e7ea5ce7aae97383db95003319d0c43a1d68372402'
18-
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.56@sha256:ff9bbcb82cc2b4ce5c322e45a5afe2a952cf2a418e13aa4b57bf5609f854a0d4'
19-
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.56@sha256:ff9bbcb82cc2b4ce5c322e45a5afe2a952cf2a418e13aa4b57bf5609f854a0d4'
20-
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.21@sha256:620cdfaa9c45b4941090e2b557f5f551fbc1189caf13689e5bbfbd5c76885400'
17+
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.88@sha256:80fa0eae4f2736d78a4f3df7699f0bebb7775de6deda3a297dd8d08067bd5e66'
18+
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.57@sha256:93cbc1e643c51b086d7c7c7a10e09550027da73c65ec436bb1de2dddf7989a54'
19+
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.57@sha256:93cbc1e643c51b086d7c7c7a10e09550027da73c65ec436bb1de2dddf7989a54'
20+
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.22@sha256:f125976d867860e46d4a4da3f6fb37567ebca6305fa0751e95530da81ad5de0e'
2121
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:fe69f9642c7edde46bbd78326d2c42c6e13fc73694efb142e92e206725479328'
2222
image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14@sha256:374f588420087517a3cc0235e11293bffd72d7a59da3d98d5e69f014ff2a7761'
2323
# `services`
2424
services_docker_dind: &services_docker_dind
25-
- 'docker:dind@sha256:3a861ec98623bd6014610291123751dc19e0c6d474ac3b38767771791ac0eb5e'
25+
- 'docker:28.1.1-dind@sha256:1e9d444274b295261e49f96635f3d56a615cb3ae2021204160f8ac3cdf8f3b58'
2626
# yamllint enable rule:line-length
2727
# `variables`
2828
# https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3
@@ -137,62 +137,27 @@ rubocop:
137137
# OpenSUSE master branch will fail until zypperpkg module is back in salt core
138138
# https://github.com/saltstack/great-module-migration/issues/14
139139
#
140-
# debian-12-master-py3: {extends: '.test_instance'}
141-
# debian-11-master-py3: {extends: '.test_instance'}
142-
# ubuntu-2404-master-py3: {extends: '.test_instance'}
143-
# ubuntu-2204-master-py3: {extends: '.test_instance'}
144-
# ubuntu-2004-master-py3: {extends: '.test_instance'}
145-
# centos-stream9-master-py3: {extends: '.test_instance'}
146-
# opensuse-leap-156-master-py3: {extends: '.test_instance_failure_permitted'}
147-
# opensuse-leap-155-master-py3: {extends: '.test_instance'}
148-
# opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
149-
# amazonlinux-2023-master-py3: {extends: '.test_instance'}
150-
# fedora-41-master-py3: {extends: '.test_instance_failure_permitted'}
151-
# fedora-40-master-py3: {extends: '.test_instance'}
152-
# oraclelinux-9-master-py3: {extends: '.test_instance'}
153-
# oraclelinux-8-master-py3: {extends: '.test_instance'}
154-
# almalinux-9-master-py3: {extends: '.test_instance'}
155-
# almalinux-8-master-py3: {extends: '.test_instance'}
156-
# rockylinux-9-master-py3: {extends: '.test_instance'}
157-
# rockylinux-8-master-py3: {extends: '.test_instance'}
158-
debian-12-3007-1-py3: {extends: '.test_instance'}
159-
debian-11-3007-1-py3: {extends: '.test_instance'}
160-
ubuntu-2404-3007-1-py3: {extends: '.test_instance'}
161-
ubuntu-2204-3007-1-py3: {extends: '.test_instance'}
162-
ubuntu-2004-3007-1-py3: {extends: '.test_instance'}
163-
centos-stream9-3007-1-py3: {extends: '.test_instance'}
164-
# opensuse-leap-156-3007-1-py3: {extends: '.test_instance'}
165-
# opensuse-leap-155-3007-1-py3: {extends: '.test_instance'}
166-
# opensuse-tmbl-latest-3007-1-py3: {extends: '.test_instance'}
167-
# fedora-41-3007-1-py3: {extends: '.test_instance_failure_permitted'}
168-
# fedora-40-3007-1-py3: {extends: '.test_instance'}
169-
# amazonlinux-2-3007-1-py3: {extends: '.test_instance_failure_permitted'}
170-
# amazonlinux-2023-3007-1-py3: {extends: '.test_instance'}
171-
# oraclelinux-9-3007-1-py3: {extends: '.test_instance'}
172-
# oraclelinux-8-3007-1-py3: {extends: '.test_instance'}
173-
# almalinux-9-3007-1-py3: {extends: '.test_instance'}
174-
# almalinux-8-3007-1-py3: {extends: '.test_instance'}
175-
# rockylinux-9-3007-1-py3: {extends: '.test_instance'}
176-
# rockylinux-8-3007-1-py3: {extends: '.test_instance'}
177-
debian-12-3006-10-py3: {extends: '.test_instance'}
178-
debian-11-3006-10-py3: {extends: '.test_instance'}
179-
ubuntu-2404-3006-10-py3: {extends: '.test_instance'}
180-
ubuntu-2204-3006-10-py3: {extends: '.test_instance'}
181-
ubuntu-2004-3006-10-py3: {extends: '.test_instance'}
182-
centos-stream9-3006-10-py3: {extends: '.test_instance'}
183-
# opensuse-leap-156-3006-10-py3: {extends: '.test_instance'}
184-
# opensuse-leap-155-3006-10-py3: {extends: '.test_instance'}
185-
# opensuse-tmbl-latest-3006-10-py3: {extends: '.test_instance'}
186-
# fedora-41-3006-10-py3: {extends: '.test_instance_failure_permitted'}
187-
# fedora-40-3006-10-py3: {extends: '.test_instance'}
188-
# amazonlinux-2-3006-10-py3: {extends: '.test_instance_failure_permitted'}
189-
# amazonlinux-2023-3006-10-py3: {extends: '.test_instance'}
190-
# oraclelinux-9-3006-10-py3: {extends: '.test_instance'}
191-
# oraclelinux-8-3006-10-py3: {extends: '.test_instance'}
192-
# almalinux-9-3006-10-py3: {extends: '.test_instance'}
193-
# almalinux-8-3006-10-py3: {extends: '.test_instance'}
194-
# rockylinux-9-3006-10-py3: {extends: '.test_instance'}
195-
# rockylinux-8-3006-10-py3: {extends: '.test_instance'}
140+
debian-12-master: {extends: '.test_instance_failure_permitted'}
141+
debian-11-master: {extends: '.test_instance_failure_permitted'}
142+
rockylinux-9-master: {extends: '.test_instance_failure_permitted'}
143+
rockylinux-8-master: {extends: '.test_instance_failure_permitted'}
144+
ubuntu-2404-master: {extends: '.test_instance_failure_permitted'}
145+
ubuntu-2204-master: {extends: '.test_instance_failure_permitted'}
146+
ubuntu-2004-master: {extends: '.test_instance_failure_permitted'}
147+
debian-12-3007-2: {extends: '.test_instance'}
148+
debian-11-3007-2: {extends: '.test_instance'}
149+
rockylinux-9-3007-2: {extends: '.test_instance'}
150+
rockylinux-8-3007-2: {extends: '.test_instance'}
151+
ubuntu-2404-3007-2: {extends: '.test_instance'}
152+
ubuntu-2204-3007-2: {extends: '.test_instance'}
153+
ubuntu-2004-3007-2: {extends: '.test_instance'}
154+
debian-12-3006-10: {extends: '.test_instance'}
155+
debian-11-3006-10: {extends: '.test_instance'}
156+
rockylinux-9-3006-10: {extends: '.test_instance'}
157+
rockylinux-8-3006-10: {extends: '.test_instance'}
158+
ubuntu-2404-3006-10: {extends: '.test_instance'}
159+
ubuntu-2204-3006-10: {extends: '.test_instance'}
160+
ubuntu-2004-3006-10: {extends: '.test_instance'}
196161
# yamllint enable rule:line-length
197162

198163
###############################################################################

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ repos:
2626
stages: [commit-msg]
2727
additional_dependencies: ['@commitlint/[email protected]']
2828
- repo: https://github.com/rubocop-hq/rubocop
29-
rev: v1.75.5
29+
rev: v1.75.6
3030
hooks:
3131
- id: rubocop
3232
name: Check Ruby files with rubocop
@@ -96,7 +96,7 @@ repos:
9696
)$
9797
additional_dependencies: [pygments==2.16.1]
9898
- repo: https://github.com/renovatebot/pre-commit-hooks
99-
rev: 40.10.4
99+
rev: 40.19.0
100100
hooks:
101101
- id: renovate-config-validator
102102
name: Check Renovate config with renovate-config-validator

0 commit comments

Comments
 (0)