Salt/salt-formula
0
0 Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2026-10-07 18:49:35 +02:00
Code Issues Activity

Merge pull request #572 from saltstack-formulas/renovate/https-github.com-dafyddj-copier-ssf-ci-2.x

Browse Source 
chore(copier): update template https://github.com/dafyddj/copier-ssf-ci to v2.5.1
This commit is contained in:
Dafydd Jones authored and GitHub committed 2025-07-29 19:25:37 +01:00
2 parents 72e0ffc0fd 31aedd55b1
commit 0f2b280a28
6 files changed
+123 -123
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.copier-answers.ssf-ci.yml
+1 -1
View File
@@ -1,5 +1,5 @@
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
_commit: v2.4.0 _commit: v2.5.1
_src_path: https://github.com/dafyddj/copier-ssf-ci _src_path: https://github.com/dafyddj/copier-ssf-ci
failure_permitted_ignored: [] failure_permitted_ignored: []
failure_permitted_patterns: [] failure_permitted_patterns: []
.github/workflows/main.yml
+1 -1
View File
@@ -25,7 +25,7 @@ jobs:
name: Lint / `pre-commit` name: Lint / `pre-commit`
needs: should-run needs: should-run
if: fromJSON(needs.should-run.outputs.should-run) if: fromJSON(needs.should-run.outputs.should-run)
container: techneg/ci-pre-commit:v2.4.28@sha256:3a5b362f2fdf60e3a6c614a919c67cc8ae5d34208e287d293fc30c150a919ac6 container: techneg/ci-pre-commit:v2.4.31@sha256:041f7d716f4cde881e547881e6cc771d499ff424d0afb7ec678176ff0b940d0a
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 5 timeout-minutes: 5
steps: steps:
.gitlab-ci.yml
+41 -41
View File
@@ -15,15 +15,15 @@
stage_test: &stage_test 'test' stage_test: &stage_test 'test'
# `image` # `image`
# yamllint disable rule:line-length # yamllint disable rule:line-length
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.94@sha256:3913ba70632c591b1accf8f65324008cfcbfb231e03a34908dd92022b3cd9fe4' image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.97@sha256:7eaa2170f49cf9a8f2acd11a9fc35d4ec93c514935c6b76f7df8a39f9d2afb45'
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.63@sha256:d2dd81049d7c0c8e369c744d57824685ae089403c53b1c767d9cfe1c691d9327' image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.66@sha256:5a915fcebd0c32f54b4effcf1aa58ce03f78fc8e8b95e706183ec57c24c9337c'
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.63@sha256:d2dd81049d7c0c8e369c744d57824685ae089403c53b1c767d9cfe1c691d9327' image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.66@sha256:5a915fcebd0c32f54b4effcf1aa58ce03f78fc8e8b95e706183ec57c24c9337c'
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.28@sha256:3a5b362f2fdf60e3a6c614a919c67cc8ae5d34208e287d293fc30c150a919ac6' image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.31@sha256:041f7d716f4cde881e547881e6cc771d499ff424d0afb7ec678176ff0b940d0a'
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:fe69f9642c7edde46bbd78326d2c42c6e13fc73694efb142e92e206725479328' image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:fe69f9642c7edde46bbd78326d2c42c6e13fc73694efb142e92e206725479328'
image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14@sha256:374f588420087517a3cc0235e11293bffd72d7a59da3d98d5e69f014ff2a7761' image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14@sha256:374f588420087517a3cc0235e11293bffd72d7a59da3d98d5e69f014ff2a7761'
# `services` # `services`
services_docker_dind: &services_docker_dind services_docker_dind: &services_docker_dind
- 'docker:28.3.0-dind@sha256:d33eb93fe02683e984e6f8a93c0b3d85bb74f56ec83922bc39fb34ba23ab42bc' - 'docker:28.3.2-dind@sha256:5415fccf3da3aed821efb2258cb7dcf52fb9bb0627b02d45338e887c352c4bce'
# yamllint enable rule:line-length # yamllint enable rule:line-length
# `variables` # `variables`
# https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3 # https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3
@@ -184,42 +184,42 @@ rockylinux-8-master: {extends: '.test_instance_failure_permitted'}
ubuntu-2404-master: {extends: '.test_instance_failure_permitted'} ubuntu-2404-master: {extends: '.test_instance_failure_permitted'}
ubuntu-2204-master: {extends: '.test_instance_failure_permitted'} ubuntu-2204-master: {extends: '.test_instance_failure_permitted'}
ubuntu-2004-master: {extends: '.test_instance_failure_permitted'} ubuntu-2004-master: {extends: '.test_instance_failure_permitted'}
almalinux-9-3007-5: {extends: '.test_instance'} almalinux-9-3007-6: {extends: '.test_instance'}
almalinux-8-3007-5: {extends: '.test_instance'} almalinux-8-3007-6: {extends: '.test_instance'}
amazonlinux-2023-3007-5: {extends: '.test_instance'} amazonlinux-2023-3007-6: {extends: '.test_instance'}
amazonlinux-2-3007-5: {extends: '.test_instance_failure_permitted'} amazonlinux-2-3007-6: {extends: '.test_instance_failure_permitted'}
centos-stream9-3007-5: {extends: '.test_instance'} centos-stream9-3007-6: {extends: '.test_instance'}
debian-12-3007-5: {extends: '.test_instance'} debian-12-3007-6: {extends: '.test_instance'}
debian-11-3007-5: {extends: '.test_instance'} debian-11-3007-6: {extends: '.test_instance'}
fedora-41-3007-5: {extends: '.test_instance_failure_permitted'} fedora-41-3007-6: {extends: '.test_instance_failure_permitted'}
fedora-40-3007-5: {extends: '.test_instance'} fedora-40-3007-6: {extends: '.test_instance'}
opensuse-leap-156-3007-5: {extends: '.test_instance'} opensuse-leap-156-3007-6: {extends: '.test_instance'}
opensuse-tmbl-latest-3007-5: {extends: '.test_instance'} opensuse-tmbl-latest-3007-6: {extends: '.test_instance'}
oraclelinux-9-3007-5: {extends: '.test_instance'} oraclelinux-9-3007-6: {extends: '.test_instance'}
oraclelinux-8-3007-5: {extends: '.test_instance'} oraclelinux-8-3007-6: {extends: '.test_instance'}
rockylinux-9-3007-5: {extends: '.test_instance'} rockylinux-9-3007-6: {extends: '.test_instance'}
rockylinux-8-3007-5: {extends: '.test_instance'} rockylinux-8-3007-6: {extends: '.test_instance'}
ubuntu-2404-3007-5: {extends: '.test_instance'} ubuntu-2404-3007-6: {extends: '.test_instance'}
ubuntu-2204-3007-5: {extends: '.test_instance'} ubuntu-2204-3007-6: {extends: '.test_instance'}
ubuntu-2004-3007-5: {extends: '.test_instance'} ubuntu-2004-3007-6: {extends: '.test_instance'}
almalinux-9-3006-13: {extends: '.test_instance'} almalinux-9-3006-14: {extends: '.test_instance'}
almalinux-8-3006-13: {extends: '.test_instance'} almalinux-8-3006-14: {extends: '.test_instance'}
amazonlinux-2023-3006-13: {extends: '.test_instance'} amazonlinux-2023-3006-14: {extends: '.test_instance'}
amazonlinux-2-3006-13: {extends: '.test_instance_failure_permitted'} amazonlinux-2-3006-14: {extends: '.test_instance_failure_permitted'}
centos-stream9-3006-13: {extends: '.test_instance'} centos-stream9-3006-14: {extends: '.test_instance'}
debian-12-3006-13: {extends: '.test_instance'} debian-12-3006-14: {extends: '.test_instance'}
debian-11-3006-13: {extends: '.test_instance'} debian-11-3006-14: {extends: '.test_instance'}
fedora-41-3006-13: {extends: '.test_instance_failure_permitted'} fedora-41-3006-14: {extends: '.test_instance_failure_permitted'}
fedora-40-3006-13: {extends: '.test_instance'} fedora-40-3006-14: {extends: '.test_instance'}
opensuse-leap-156-3006-13: {extends: '.test_instance'} opensuse-leap-156-3006-14: {extends: '.test_instance'}
opensuse-tmbl-latest-3006-13: {extends: '.test_instance'} opensuse-tmbl-latest-3006-14: {extends: '.test_instance'}
oraclelinux-9-3006-13: {extends: '.test_instance'} oraclelinux-9-3006-14: {extends: '.test_instance'}
oraclelinux-8-3006-13: {extends: '.test_instance'} oraclelinux-8-3006-14: {extends: '.test_instance'}
rockylinux-9-3006-13: {extends: '.test_instance'} rockylinux-9-3006-14: {extends: '.test_instance'}
rockylinux-8-3006-13: {extends: '.test_instance'} rockylinux-8-3006-14: {extends: '.test_instance'}
ubuntu-2404-3006-13: {extends: '.test_instance'} ubuntu-2404-3006-14: {extends: '.test_instance'}
ubuntu-2204-3006-13: {extends: '.test_instance'} ubuntu-2204-3006-14: {extends: '.test_instance'}
ubuntu-2004-3006-13: {extends: '.test_instance'} ubuntu-2004-3006-14: {extends: '.test_instance'}
# yamllint enable rule:line-length # yamllint enable rule:line-length
############################################################################### ###############################################################################
.pre-commit-config.yaml
+3 -3
View File
@@ -30,7 +30,7 @@ repos:
- id: commitlint - id: commitlint
- id: commitlint-ci - id: commitlint-ci
- repo: https://github.com/rubocop-hq/rubocop - repo: https://github.com/rubocop-hq/rubocop
rev: v1.77.0 rev: v1.78.0
hooks: hooks:
- id: rubocop - id: rubocop
name: Check Ruby files with rubocop name: Check Ruby files with rubocop
@@ -100,12 +100,12 @@ repos:
)$ )$
additional_dependencies: [pygments==2.16.1] additional_dependencies: [pygments==2.16.1]
- repo: https://github.com/renovatebot/pre-commit-hooks - repo: https://github.com/renovatebot/pre-commit-hooks
rev: 40.62.1 rev: 41.42.2
hooks: hooks:
- id: renovate-config-validator - id: renovate-config-validator
name: Check Renovate config with renovate-config-validator name: Check Renovate config with renovate-config-validator
- repo: https://github.com/python-jsonschema/check-jsonschema - repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.33.1 rev: 0.33.2
hooks: hooks:
- id: check-github-workflows - id: check-github-workflows
name: Check GitHub workflows with check-jsonschema name: Check GitHub workflows with check-jsonschema
Gemfile.lock
+3 -3
View File
@@ -521,10 +521,10 @@ GEM
net-ssh (7.3.0) net-ssh (7.3.0)
net-ssh-gateway (2.0.0) net-ssh-gateway (2.0.0)
net-ssh (>= 4.0.0) net-ssh (>= 4.0.0)
nokogiri (1.18.8) nokogiri (1.18.9)
mini_portile2 (~> 2.8.2) mini_portile2 (~> 2.8.2)
racc (~> 1.4) racc (~> 1.4)
nokogiri (1.18.8-x64-mingw-ucrt) nokogiri (1.18.9-x64-mingw-ucrt)
racc (~> 1.4) racc (~> 1.4)
nori (2.7.0) nori (2.7.0)
bigdecimal bigdecimal
@@ -631,7 +631,7 @@ GEM
winrm (~> 2.0) winrm (~> 2.0)
winrm-elevated (~> 1.0) winrm-elevated (~> 1.0)
winrm-fs (~> 1.1) winrm-fs (~> 1.1)
thor (1.3.2) thor (1.4.0)
timeliness (0.3.10) timeliness (0.3.10)
tomlrb (1.3.0) tomlrb (1.3.0)
trailblazer-option (0.1.2) trailblazer-option (0.1.2)
kitchen.yml
+74 -74
View File
@@ -91,143 +91,143 @@ platforms:
driver: driver:
image: saltimages/salt-master-py3:rockylinux-8 image: saltimages/salt-master-py3:rockylinux-8
## SALT `3007.5` ## SALT `3007.6`
- name: debian-12-3007-5 - name: debian-12-3007-6
driver: driver:
image: saltimages/salt-3007.5-py3:debian-12 image: saltimages/salt-3007.6-py3:debian-12
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: debian-11-3007-5 - name: debian-11-3007-6
driver: driver:
image: saltimages/salt-3007.5-py3:debian-11 image: saltimages/salt-3007.6-py3:debian-11
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: ubuntu-2404-3007-5 - name: ubuntu-2404-3007-6
driver: driver:
image: saltimages/salt-3007.5-py3:ubuntu-24.04 image: saltimages/salt-3007.6-py3:ubuntu-24.04
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: ubuntu-2204-3007-5 - name: ubuntu-2204-3007-6
driver: driver:
image: saltimages/salt-3007.5-py3:ubuntu-22.04 image: saltimages/salt-3007.6-py3:ubuntu-22.04
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: ubuntu-2004-3007-5 - name: ubuntu-2004-3007-6
driver: driver:
image: saltimages/salt-3007.5-py3:ubuntu-20.04 image: saltimages/salt-3007.6-py3:ubuntu-20.04
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: centos-stream9-3007-5 - name: centos-stream9-3007-6
driver: driver:
image: saltimages/salt-3007.5-py3:centos-stream9 image: saltimages/salt-3007.6-py3:centos-stream9
- name: opensuse-leap-156-3007-5 - name: opensuse-leap-156-3007-6
driver: driver:
image: saltimages/salt-3007.5-py3:opensuse-leap-15.6 image: saltimages/salt-3007.6-py3:opensuse-leap-15.6
# Workaround to avoid intermittent failures on `opensuse-leap-15.6`: # Workaround to avoid intermittent failures on `opensuse-leap-15.6`:
# => SCP did not finish successfully (255): (Net::SCP::Error) # => SCP did not finish successfully (255): (Net::SCP::Error)
transport: transport:
max_ssh_sessions: 1 max_ssh_sessions: 1
- name: opensuse-tmbl-latest-3007-5 - name: opensuse-tmbl-latest-3007-6
driver: driver:
image: saltimages/salt-3007.5-py3:opensuse-tumbleweed-latest image: saltimages/salt-3007.6-py3:opensuse-tumbleweed-latest
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
# => SCP did not finish successfully (255): (Net::SCP::Error) # => SCP did not finish successfully (255): (Net::SCP::Error)
transport: transport:
max_ssh_sessions: 1 max_ssh_sessions: 1
- name: fedora-41-3007-5 - name: fedora-41-3007-6
driver: driver:
image: saltimages/salt-3007.5-py3:fedora-41 image: saltimages/salt-3007.6-py3:fedora-41
- name: fedora-40-3007-5 - name: fedora-40-3007-6
driver: driver:
image: saltimages/salt-3007.5-py3:fedora-40 image: saltimages/salt-3007.6-py3:fedora-40
- name: amazonlinux-2023-3007-5 - name: amazonlinux-2023-3007-6
driver: driver:
image: saltimages/salt-3007.5-py3:amazonlinux-2023 image: saltimages/salt-3007.6-py3:amazonlinux-2023
- name: amazonlinux-2-3007-5 - name: amazonlinux-2-3007-6
driver: driver:
image: saltimages/salt-3007.5-py3:amazonlinux-2 image: saltimages/salt-3007.6-py3:amazonlinux-2
- name: oraclelinux-9-3007-5 - name: oraclelinux-9-3007-6
driver: driver:
image: saltimages/salt-3007.5-py3:oraclelinux-9 image: saltimages/salt-3007.6-py3:oraclelinux-9
- name: oraclelinux-8-3007-5 - name: oraclelinux-8-3007-6
driver: driver:
image: saltimages/salt-3007.5-py3:oraclelinux-8 image: saltimages/salt-3007.6-py3:oraclelinux-8
- name: almalinux-9-3007-5 - name: almalinux-9-3007-6
driver: driver:
image: saltimages/salt-3007.5-py3:almalinux-9 image: saltimages/salt-3007.6-py3:almalinux-9
- name: almalinux-8-3007-5 - name: almalinux-8-3007-6
driver: driver:
image: saltimages/salt-3007.5-py3:almalinux-8 image: saltimages/salt-3007.6-py3:almalinux-8
- name: rockylinux-9-3007-5 - name: rockylinux-9-3007-6
driver: driver:
image: saltimages/salt-3007.5-py3:rockylinux-9 image: saltimages/salt-3007.6-py3:rockylinux-9
- name: rockylinux-8-3007-5 - name: rockylinux-8-3007-6
driver: driver:
image: saltimages/salt-3007.5-py3:rockylinux-8 image: saltimages/salt-3007.6-py3:rockylinux-8
## SALT `3006.13` ## SALT `3006.14`
- name: debian-12-3006-13 - name: debian-12-3006-14
driver: driver:
image: saltimages/salt-3006.13-py3:debian-12 image: saltimages/salt-3006.14-py3:debian-12
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: debian-11-3006-13 - name: debian-11-3006-14
driver: driver:
image: saltimages/salt-3006.13-py3:debian-11 image: saltimages/salt-3006.14-py3:debian-11
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: ubuntu-2404-3006-13 - name: ubuntu-2404-3006-14
driver: driver:
image: saltimages/salt-3006.13-py3:ubuntu-24.04 image: saltimages/salt-3006.14-py3:ubuntu-24.04
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: ubuntu-2204-3006-13 - name: ubuntu-2204-3006-14
driver: driver:
image: saltimages/salt-3006.13-py3:ubuntu-22.04 image: saltimages/salt-3006.14-py3:ubuntu-22.04
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: ubuntu-2004-3006-13 - name: ubuntu-2004-3006-14
driver: driver:
image: saltimages/salt-3006.13-py3:ubuntu-20.04 image: saltimages/salt-3006.14-py3:ubuntu-20.04
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: centos-stream9-3006-13 - name: centos-stream9-3006-14
driver: driver:
image: saltimages/salt-3006.13-py3:centos-stream9 image: saltimages/salt-3006.14-py3:centos-stream9
- name: opensuse-tmbl-latest-3006-13 - name: opensuse-tmbl-latest-3006-14
driver: driver:
image: saltimages/salt-3006.13-py3:opensuse-tumbleweed-latest image: saltimages/salt-3006.14-py3:opensuse-tumbleweed-latest
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
# => SCP did not finish successfully (255): (Net::SCP::Error) # => SCP did not finish successfully (255): (Net::SCP::Error)
transport: transport:
max_ssh_sessions: 1 max_ssh_sessions: 1
- name: opensuse-leap-156-3006-13 - name: opensuse-leap-156-3006-14
driver: driver:
image: saltimages/salt-3006.13-py3:opensuse-leap-15.6 image: saltimages/salt-3006.14-py3:opensuse-leap-15.6
# Workaround to avoid intermittent failures on `opensuse-leap-15.6`: # Workaround to avoid intermittent failures on `opensuse-leap-15.6`:
# => SCP did not finish successfully (255): (Net::SCP::Error) # => SCP did not finish successfully (255): (Net::SCP::Error)
transport: transport:
max_ssh_sessions: 1 max_ssh_sessions: 1
- name: fedora-41-3006-13 - name: fedora-41-3006-14
driver: driver:
image: saltimages/salt-3006.13-py3:fedora-41 image: saltimages/salt-3006.14-py3:fedora-41
- name: fedora-40-3006-13 - name: fedora-40-3006-14
driver: driver:
image: saltimages/salt-3006.13-py3:fedora-40 image: saltimages/salt-3006.14-py3:fedora-40
- name: amazonlinux-2023-3006-13 - name: amazonlinux-2023-3006-14
driver: driver:
image: saltimages/salt-3006.13-py3:amazonlinux-2023 image: saltimages/salt-3006.14-py3:amazonlinux-2023
- name: amazonlinux-2-3006-13 - name: amazonlinux-2-3006-14
driver: driver:
image: saltimages/salt-3006.13-py3:amazonlinux-2 image: saltimages/salt-3006.14-py3:amazonlinux-2
- name: oraclelinux-9-3006-13 - name: oraclelinux-9-3006-14
driver: driver:
image: saltimages/salt-3006.13-py3:oraclelinux-9 image: saltimages/salt-3006.14-py3:oraclelinux-9
- name: oraclelinux-8-3006-13 - name: oraclelinux-8-3006-14
driver: driver:
image: saltimages/salt-3006.13-py3:oraclelinux-8 image: saltimages/salt-3006.14-py3:oraclelinux-8
- name: almalinux-9-3006-13 - name: almalinux-9-3006-14
driver: driver:
image: saltimages/salt-3006.13-py3:almalinux-9 image: saltimages/salt-3006.14-py3:almalinux-9
- name: almalinux-8-3006-13 - name: almalinux-8-3006-14
driver: driver:
image: saltimages/salt-3006.13-py3:almalinux-8 image: saltimages/salt-3006.14-py3:almalinux-8
- name: rockylinux-9-3006-13 - name: rockylinux-9-3006-14
driver: driver:
image: saltimages/salt-3006.13-py3:rockylinux-9 image: saltimages/salt-3006.14-py3:rockylinux-9
- name: rockylinux-8-3006-13 - name: rockylinux-8-3006-14
driver: driver:
image: saltimages/salt-3006.13-py3:rockylinux-8 image: saltimages/salt-3006.14-py3:rockylinux-8
########################################################## ##########################################################
# This file is managed as part of a Copier template. # # This file is managed as part of a Copier template. #