Skip to content

Commit 544caa9

Browse files
dafyddjdafyddj
authored
Merge pull request #136 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.4.1
2 parents 7667173 + 82d7fc5 commit 544caa9

File tree

5 files changed

+168
-141
lines changed

5 files changed

+168
-141
lines changed

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

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
11
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
2-
_commit: v1.1.9
2+
_commit: v1.4.1
33
_src_path: https://github.com/dafyddj/copier-ssf-ci
4+
failure_permitted_pattern: "(?x)(\n -master$|\n ^fedora-41-|\n ^amazonlinux-2-\n\
5+
)"
46
formula_name: postfix
7+
renovate_extend_presets:
8+
- github>saltstack-formulas/.github
9+
- github>saltstack-formulas/.github:copier
10+
renovate_ignore_presets: []
11+
supported_oses:
12+
- AlmaLinux OS
13+
- Amazon Linux
14+
- CentOS
15+
- Debian
16+
- Fedora Linux
17+
- openSUSE
18+
- Oracle Linux
19+
- Rocky Linux
20+
- Ubuntu

‎.github/renovate.json5‎

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,11 @@
11
{
2-
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
3-
enabledManagers: [
4-
'copier',
5-
'git-submodules',
6-
],
7-
extends: [
8-
'config:recommended',
9-
'github>saltstack-formulas/.github',
10-
],
11-
automergeStrategy: 'merge-commit',
12-
'git-submodules': {
13-
'enabled': true
14-
},
15-
packageRules: [
16-
{
17-
matchFileNames: [
18-
'template/**'
19-
],
20-
semanticCommitType: 'fix',
21-
},
22-
{
23-
automerge: true,
24-
matchManagers: [
25-
'git-submodules'
26-
],
27-
},
28-
],
2+
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
3+
extends: [
4+
"github>saltstack-formulas/.github",
5+
"github>saltstack-formulas/.github:copier"
6+
],
7+
/**********************************************************
8+
* This file is managed as part of a Copier template. *
9+
* Please make your own changes below this comment. *
10+
*********************************************************/
2911
}

‎.gitlab-ci.yml‎

Lines changed: 64 additions & 35 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.89@sha256:6d51c9542819b94f0596e3568794d17e3dc742949ae438ea56c95091766d39be'
18+
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.58@sha256:914a6bd7b98efabd844f57d0d2539e8864162a73da581409a3e7fec41e0a4c5f'
19+
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.58@sha256:914a6bd7b98efabd844f57d0d2539e8864162a73da581409a3e7fec41e0a4c5f'
20+
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.23@sha256:53d89d685532acbc29b7be6a56143ec5e11a8a19d5a76969dc4f8c0a35a53425'
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:eceba5b0fc2fcf83a74c298391c2ed9e1adbdaf04ee173611bd6282ec973e7ba'
2626
# yamllint enable rule:line-length
2727
# `variables`
2828
# https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3
@@ -137,37 +137,66 @@ 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-
# The alias states were removed in the great module migration, causing the tests to fail with Salt master branch
140+
# The alias states were removed in the great module migration, causing the
141+
# tests to fail with Salt master branch
141142
# See https://github.com/saltstack-formulas/postfix-formula/issues/134
142-
debian-12-master-py3: {extends: '.test_instance_failure_permitted'}
143-
debian-11-master-py3: {extends: '.test_instance_failure_permitted'}
144-
ubuntu-2404-master-py3: {extends: '.test_instance_failure_permitted'}
145-
ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
146-
ubuntu-2004-master-py3: {extends: '.test_instance_failure_permitted'}
147-
centos-stream9-master-py3: {extends: '.test_instance_failure_permitted'}
148-
opensuse-leap-156-master-py3: {extends: '.test_instance_failure_permitted'}
149-
opensuse-leap-155-master-py3: {extends: '.test_instance_failure_permitted'}
150-
fedora-41-master-py3: {extends: '.test_instance_failure_permitted'}
151-
fedora-40-master-py3: {extends: '.test_instance_failure_permitted'}
152-
debian-12-3007-1-py3: {extends: '.test_instance'}
153-
debian-11-3007-1-py3: {extends: '.test_instance'}
154-
ubuntu-2404-3007-1-py3: {extends: '.test_instance'}
155-
ubuntu-2204-3007-1-py3: {extends: '.test_instance'}
156-
ubuntu-2004-3007-1-py3: {extends: '.test_instance'}
157-
centos-stream9-3007-1-py3: {extends: '.test_instance'}
158-
opensuse-leap-156-3007-1-py3: {extends: '.test_instance'}
159-
opensuse-leap-155-3007-1-py3: {extends: '.test_instance'}
160-
fedora-41-3007-1-py3: {extends: '.test_instance_failure_permitted'}
161-
fedora-40-3007-1-py3: {extends: '.test_instance'}
162-
debian-12-3006-10-py3: {extends: '.test_instance'}
163-
debian-11-3006-10-py3: {extends: '.test_instance'}
164-
ubuntu-2404-3006-10-py3: {extends: '.test_instance'}
165-
ubuntu-2204-3006-10-py3: {extends: '.test_instance'}
166-
ubuntu-2004-3006-10-py3: {extends: '.test_instance'}
167-
opensuse-leap-156-3006-10-py3: {extends: '.test_instance'}
168-
opensuse-leap-155-3006-10-py3: {extends: '.test_instance'}
169-
fedora-41-3006-10-py3: {extends: '.test_instance_failure_permitted'}
170-
fedora-40-3006-10-py3: {extends: '.test_instance'}
143+
almalinux-9-master: {extends: '.test_instance_failure_permitted'}
144+
almalinux-8-master: {extends: '.test_instance_failure_permitted'}
145+
amazonlinux-2023-master: {extends: '.test_instance_failure_permitted'}
146+
amazonlinux-2-master: {extends: '.test_instance_failure_permitted'}
147+
centos-stream9-master: {extends: '.test_instance_failure_permitted'}
148+
debian-12-master: {extends: '.test_instance_failure_permitted'}
149+
debian-11-master: {extends: '.test_instance_failure_permitted'}
150+
fedora-41-master: {extends: '.test_instance_failure_permitted'}
151+
fedora-40-master: {extends: '.test_instance_failure_permitted'}
152+
opensuse-leap-156-master: {extends: '.test_instance_failure_permitted'}
153+
opensuse-leap-155-master: {extends: '.test_instance_failure_permitted'}
154+
opensuse-tmbl-latest-master: {extends: '.test_instance_failure_permitted'}
155+
oraclelinux-9-master: {extends: '.test_instance_failure_permitted'}
156+
oraclelinux-8-master: {extends: '.test_instance_failure_permitted'}
157+
rockylinux-9-master: {extends: '.test_instance_failure_permitted'}
158+
rockylinux-8-master: {extends: '.test_instance_failure_permitted'}
159+
ubuntu-2404-master: {extends: '.test_instance_failure_permitted'}
160+
ubuntu-2204-master: {extends: '.test_instance_failure_permitted'}
161+
ubuntu-2004-master: {extends: '.test_instance_failure_permitted'}
162+
almalinux-9-3007-2: {extends: '.test_instance'}
163+
almalinux-8-3007-2: {extends: '.test_instance'}
164+
amazonlinux-2023-3007-2: {extends: '.test_instance'}
165+
amazonlinux-2-3007-2: {extends: '.test_instance_failure_permitted'}
166+
centos-stream9-3007-2: {extends: '.test_instance'}
167+
debian-12-3007-2: {extends: '.test_instance'}
168+
debian-11-3007-2: {extends: '.test_instance'}
169+
fedora-41-3007-2: {extends: '.test_instance_failure_permitted'}
170+
fedora-40-3007-2: {extends: '.test_instance'}
171+
opensuse-leap-156-3007-2: {extends: '.test_instance'}
172+
opensuse-leap-155-3007-2: {extends: '.test_instance'}
173+
opensuse-tmbl-latest-3007-2: {extends: '.test_instance'}
174+
oraclelinux-9-3007-2: {extends: '.test_instance'}
175+
oraclelinux-8-3007-2: {extends: '.test_instance'}
176+
rockylinux-9-3007-2: {extends: '.test_instance'}
177+
rockylinux-8-3007-2: {extends: '.test_instance'}
178+
ubuntu-2404-3007-2: {extends: '.test_instance'}
179+
ubuntu-2204-3007-2: {extends: '.test_instance'}
180+
ubuntu-2004-3007-2: {extends: '.test_instance'}
181+
almalinux-9-3006-10: {extends: '.test_instance'}
182+
almalinux-8-3006-10: {extends: '.test_instance'}
183+
amazonlinux-2023-3006-10: {extends: '.test_instance'}
184+
amazonlinux-2-3006-10: {extends: '.test_instance_failure_permitted'}
185+
centos-stream9-3006-10: {extends: '.test_instance'}
186+
debian-12-3006-10: {extends: '.test_instance'}
187+
debian-11-3006-10: {extends: '.test_instance'}
188+
fedora-41-3006-10: {extends: '.test_instance_failure_permitted'}
189+
fedora-40-3006-10: {extends: '.test_instance'}
190+
opensuse-leap-156-3006-10: {extends: '.test_instance'}
191+
opensuse-leap-155-3006-10: {extends: '.test_instance'}
192+
opensuse-tmbl-latest-3006-10: {extends: '.test_instance'}
193+
oraclelinux-9-3006-10: {extends: '.test_instance'}
194+
oraclelinux-8-3006-10: {extends: '.test_instance'}
195+
rockylinux-9-3006-10: {extends: '.test_instance'}
196+
rockylinux-8-3006-10: {extends: '.test_instance'}
197+
ubuntu-2404-3006-10: {extends: '.test_instance'}
198+
ubuntu-2204-3006-10: {extends: '.test_instance'}
199+
ubuntu-2004-3006-10: {extends: '.test_instance'}
171200
# yamllint enable rule:line-length
172201

173202
###############################################################################

‎.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.7
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.32.7
100100
hooks:
101101
- id: renovate-config-validator
102102
name: Check Renovate config with renovate-config-validator

0 commit comments

Comments
 (0)