Skip to content

Commit fb3c9df

Browse files
chore(deps): update dependency https://github.com/dafyddj/copier-ssf-ci to v1.4.1
1 parent 7667173 commit fb3c9df

File tree

5 files changed

+112
-84
lines changed

5 files changed

+112
-84
lines changed

.copier-answers.ssf-ci.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
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: -master
45
formula_name: postfix
6+
renovate_extend_presets:
7+
- github>saltstack-formulas/.github
8+
- github>saltstack-formulas/.github:copier
9+
renovate_ignore_presets: []
10+
supported_oses:
11+
- Debian

.github/renovate.json5

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
<<<<<<< before updating
23
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
34
enabledManagers: [
45
'copier',
@@ -26,4 +27,15 @@
2627
],
2728
},
2829
],
30+
=======
31+
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
32+
extends: [
33+
"github>saltstack-formulas/.github",
34+
"github>saltstack-formulas/.github:copier"
35+
],
36+
/**********************************************************
37+
* This file is managed as part of a Copier template. *
38+
* Please make your own changes below this comment. *
39+
*********************************************************/
40+
>>>>>>> after updating
2941
}

.gitlab-ci.yml

Lines changed: 14 additions & 5 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,6 +137,7 @@ 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+
<<<<<<< before updating
140141
# The alias states were removed in the great module migration, causing the tests to fail with Salt master branch
141142
# See https://github.com/saltstack-formulas/postfix-formula/issues/134
142143
debian-12-master-py3: {extends: '.test_instance_failure_permitted'}
@@ -168,6 +169,14 @@ opensuse-leap-156-3006-10-py3: {extends: '.test_instance'}
168169
opensuse-leap-155-3006-10-py3: {extends: '.test_instance'}
169170
fedora-41-3006-10-py3: {extends: '.test_instance_failure_permitted'}
170171
fedora-40-3006-10-py3: {extends: '.test_instance'}
172+
=======
173+
debian-12-master: {extends: '.test_instance_failure_permitted'}
174+
debian-11-master: {extends: '.test_instance_failure_permitted'}
175+
debian-12-3007-2: {extends: '.test_instance'}
176+
debian-11-3007-2: {extends: '.test_instance'}
177+
debian-12-3006-10: {extends: '.test_instance'}
178+
debian-11-3006-10: {extends: '.test_instance'}
179+
>>>>>>> after updating
171180
# yamllint enable rule:line-length
172181

173182
###############################################################################

.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)