Skip to content

chore(deps): update dependency https://github.com/dafyddj/copier-ssf-ci to v1.4.1 #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dafyddj merged 4 commits into from
May 30, 2025
Merged

chore(deps): update dependency https://github.com/dafyddj/copier-ssf-ci to v1.4.1 #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb3c9df
chore(deps): update dependency https://github.com/dafyddj/copier-ssf-…
renovate[bot] May 30, 2025
894f5ba
chore: fixup test instances
dafyddj May 30, 2025
2443e9b
chore: fixup test instances
dafyddj May 30, 2025
82d7fc5
chore: fixup test instances
dafyddj May 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion .copier-answers.ssf-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
_commit: v1.1.9
_commit: v1.4.1
_src_path: https://github.com/dafyddj/copier-ssf-ci
failure_permitted_pattern: "(?x)(\n -master$|\n ^fedora-41-|\n ^amazonlinux-2-\n\
)"
formula_name: postfix
renovate_extend_presets:
- github>saltstack-formulas/.github
- github>saltstack-formulas/.github:copier
renovate_ignore_presets: []
supported_oses:
- AlmaLinux OS
- Amazon Linux
- CentOS
- Debian
- Fedora Linux
- openSUSE
- Oracle Linux
- Rocky Linux
- Ubuntu
36 changes: 9 additions & 27 deletions .github/renovate.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,11 @@
{
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
enabledManagers: [
'copier',
'git-submodules',
],
extends: [
'config:recommended',
'github>saltstack-formulas/.github',
],
automergeStrategy: 'merge-commit',
'git-submodules': {
'enabled': true
},
packageRules: [
{
matchFileNames: [
'template/**'
],
semanticCommitType: 'fix',
},
{
automerge: true,
matchManagers: [
'git-submodules'
],
},
],
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
extends: [
"github>saltstack-formulas/.github",
"github>saltstack-formulas/.github:copier"
],
/**********************************************************
* This file is managed as part of a Copier template. *
* Please make your own changes below this comment. *
*********************************************************/
}
99 changes: 64 additions & 35 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
stage_test: &stage_test 'test'
# `image`
# yamllint disable rule:line-length
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.87@sha256:7d88b7ea69f3cd917995d0e7ea5ce7aae97383db95003319d0c43a1d68372402'
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.56@sha256:ff9bbcb82cc2b4ce5c322e45a5afe2a952cf2a418e13aa4b57bf5609f854a0d4'
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.56@sha256:ff9bbcb82cc2b4ce5c322e45a5afe2a952cf2a418e13aa4b57bf5609f854a0d4'
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.21@sha256:620cdfaa9c45b4941090e2b557f5f551fbc1189caf13689e5bbfbd5c76885400'
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.89@sha256:6d51c9542819b94f0596e3568794d17e3dc742949ae438ea56c95091766d39be'
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.58@sha256:914a6bd7b98efabd844f57d0d2539e8864162a73da581409a3e7fec41e0a4c5f'
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.58@sha256:914a6bd7b98efabd844f57d0d2539e8864162a73da581409a3e7fec41e0a4c5f'
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.23@sha256:53d89d685532acbc29b7be6a56143ec5e11a8a19d5a76969dc4f8c0a35a53425'
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:fe69f9642c7edde46bbd78326d2c42c6e13fc73694efb142e92e206725479328'
image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14@sha256:374f588420087517a3cc0235e11293bffd72d7a59da3d98d5e69f014ff2a7761'
# `services`
services_docker_dind: &services_docker_dind
- 'docker:dind@sha256:3a861ec98623bd6014610291123751dc19e0c6d474ac3b38767771791ac0eb5e'
- 'docker:28.1.1-dind@sha256:eceba5b0fc2fcf83a74c298391c2ed9e1adbdaf04ee173611bd6282ec973e7ba'
# yamllint enable rule:line-length
# `variables`
# https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3
Expand Down Expand Up @@ -137,37 +137,66 @@ rubocop:
# OpenSUSE master branch will fail until zypperpkg module is back in salt core
# https://github.com/saltstack/great-module-migration/issues/14
#
# The alias states were removed in the great module migration, causing the tests to fail with Salt master branch
# The alias states were removed in the great module migration, causing the
# tests to fail with Salt master branch
# See https://github.com/saltstack-formulas/postfix-formula/issues/134
debian-12-master-py3: {extends: '.test_instance_failure_permitted'}
debian-11-master-py3: {extends: '.test_instance_failure_permitted'}
ubuntu-2404-master-py3: {extends: '.test_instance_failure_permitted'}
ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
ubuntu-2004-master-py3: {extends: '.test_instance_failure_permitted'}
centos-stream9-master-py3: {extends: '.test_instance_failure_permitted'}
opensuse-leap-156-master-py3: {extends: '.test_instance_failure_permitted'}
opensuse-leap-155-master-py3: {extends: '.test_instance_failure_permitted'}
fedora-41-master-py3: {extends: '.test_instance_failure_permitted'}
fedora-40-master-py3: {extends: '.test_instance_failure_permitted'}
debian-12-3007-1-py3: {extends: '.test_instance'}
debian-11-3007-1-py3: {extends: '.test_instance'}
ubuntu-2404-3007-1-py3: {extends: '.test_instance'}
ubuntu-2204-3007-1-py3: {extends: '.test_instance'}
ubuntu-2004-3007-1-py3: {extends: '.test_instance'}
centos-stream9-3007-1-py3: {extends: '.test_instance'}
opensuse-leap-156-3007-1-py3: {extends: '.test_instance'}
opensuse-leap-155-3007-1-py3: {extends: '.test_instance'}
fedora-41-3007-1-py3: {extends: '.test_instance_failure_permitted'}
fedora-40-3007-1-py3: {extends: '.test_instance'}
debian-12-3006-10-py3: {extends: '.test_instance'}
debian-11-3006-10-py3: {extends: '.test_instance'}
ubuntu-2404-3006-10-py3: {extends: '.test_instance'}
ubuntu-2204-3006-10-py3: {extends: '.test_instance'}
ubuntu-2004-3006-10-py3: {extends: '.test_instance'}
opensuse-leap-156-3006-10-py3: {extends: '.test_instance'}
opensuse-leap-155-3006-10-py3: {extends: '.test_instance'}
fedora-41-3006-10-py3: {extends: '.test_instance_failure_permitted'}
fedora-40-3006-10-py3: {extends: '.test_instance'}
almalinux-9-master: {extends: '.test_instance_failure_permitted'}
almalinux-8-master: {extends: '.test_instance_failure_permitted'}
amazonlinux-2023-master: {extends: '.test_instance_failure_permitted'}
amazonlinux-2-master: {extends: '.test_instance_failure_permitted'}
centos-stream9-master: {extends: '.test_instance_failure_permitted'}
debian-12-master: {extends: '.test_instance_failure_permitted'}
debian-11-master: {extends: '.test_instance_failure_permitted'}
fedora-41-master: {extends: '.test_instance_failure_permitted'}
fedora-40-master: {extends: '.test_instance_failure_permitted'}
opensuse-leap-156-master: {extends: '.test_instance_failure_permitted'}
opensuse-leap-155-master: {extends: '.test_instance_failure_permitted'}
opensuse-tmbl-latest-master: {extends: '.test_instance_failure_permitted'}
oraclelinux-9-master: {extends: '.test_instance_failure_permitted'}
oraclelinux-8-master: {extends: '.test_instance_failure_permitted'}
rockylinux-9-master: {extends: '.test_instance_failure_permitted'}
rockylinux-8-master: {extends: '.test_instance_failure_permitted'}
ubuntu-2404-master: {extends: '.test_instance_failure_permitted'}
ubuntu-2204-master: {extends: '.test_instance_failure_permitted'}
ubuntu-2004-master: {extends: '.test_instance_failure_permitted'}
almalinux-9-3007-2: {extends: '.test_instance'}
almalinux-8-3007-2: {extends: '.test_instance'}
amazonlinux-2023-3007-2: {extends: '.test_instance'}
amazonlinux-2-3007-2: {extends: '.test_instance_failure_permitted'}
centos-stream9-3007-2: {extends: '.test_instance'}
debian-12-3007-2: {extends: '.test_instance'}
debian-11-3007-2: {extends: '.test_instance'}
fedora-41-3007-2: {extends: '.test_instance_failure_permitted'}
fedora-40-3007-2: {extends: '.test_instance'}
opensuse-leap-156-3007-2: {extends: '.test_instance'}
opensuse-leap-155-3007-2: {extends: '.test_instance'}
opensuse-tmbl-latest-3007-2: {extends: '.test_instance'}
oraclelinux-9-3007-2: {extends: '.test_instance'}
oraclelinux-8-3007-2: {extends: '.test_instance'}
rockylinux-9-3007-2: {extends: '.test_instance'}
rockylinux-8-3007-2: {extends: '.test_instance'}
ubuntu-2404-3007-2: {extends: '.test_instance'}
ubuntu-2204-3007-2: {extends: '.test_instance'}
ubuntu-2004-3007-2: {extends: '.test_instance'}
almalinux-9-3006-10: {extends: '.test_instance'}
almalinux-8-3006-10: {extends: '.test_instance'}
amazonlinux-2023-3006-10: {extends: '.test_instance'}
amazonlinux-2-3006-10: {extends: '.test_instance_failure_permitted'}
centos-stream9-3006-10: {extends: '.test_instance'}
debian-12-3006-10: {extends: '.test_instance'}
debian-11-3006-10: {extends: '.test_instance'}
fedora-41-3006-10: {extends: '.test_instance_failure_permitted'}
fedora-40-3006-10: {extends: '.test_instance'}
opensuse-leap-156-3006-10: {extends: '.test_instance'}
opensuse-leap-155-3006-10: {extends: '.test_instance'}
opensuse-tmbl-latest-3006-10: {extends: '.test_instance'}
oraclelinux-9-3006-10: {extends: '.test_instance'}
oraclelinux-8-3006-10: {extends: '.test_instance'}
rockylinux-9-3006-10: {extends: '.test_instance'}
rockylinux-8-3006-10: {extends: '.test_instance'}
ubuntu-2404-3006-10: {extends: '.test_instance'}
ubuntu-2204-3006-10: {extends: '.test_instance'}
ubuntu-2004-3006-10: {extends: '.test_instance'}
# yamllint enable rule:line-length

###############################################################################
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ repos:
stages: [commit-msg]
additional_dependencies: ['@commitlint/[email protected]']
- repo: https://github.com/rubocop-hq/rubocop
rev: v1.75.5
rev: v1.75.7
hooks:
- id: rubocop
name: Check Ruby files with rubocop
Expand Down Expand Up @@ -96,7 +96,7 @@ repos:
)$
additional_dependencies: [pygments==2.16.1]
- repo: https://github.com/renovatebot/pre-commit-hooks
rev: 40.10.4
rev: 40.32.7
hooks:
- id: renovate-config-validator
name: Check Renovate config with renovate-config-validator
Expand Down
Loading
Loading