Skip to content

chore(copier): update template https://github.com/dafyddj/copier-ssf-ci to v2.10.2 #309

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

Open
renovate wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore(copier): update template https://github.com/dafyddj/copier-ssf-ci to v2.10.2 #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion .copier-answers.ssf-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
_commit: v2.8.0
_commit: v2.10.2
_src_path: https://github.com/dafyddj/copier-ssf-ci
failure_permitted_ignored: []
failure_permitted_patterns: []
Expand All @@ -19,3 +19,4 @@ supported_oses:
- Oracle Linux
- Rocky Linux
- Ubuntu
test_using_gha: false
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,20 @@ jobs:
name: Lint / `pre-commit`
needs: should-run
if: fromJSON(needs.should-run.outputs.should-run)
container: techneg/ci-pre-commit:v2.5.5@sha256:9d92b83a64378da3f9363668b0da244d9f12039d86579881d649ddb40ce261f3
container: techneg/ci-pre-commit:v2.5.19@sha256:64cb1f774a3d6abdd498f6be4b3dbe261f821e1dd088c00c23504f39d0c1cf03
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- run: | # Needed because of bug #2031 in `actions/checkout`
git config --global --add safe.directory "$GITHUB_WORKSPACE"
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
with:
fetch-depth: 0
fetch-tags: true
filter: tree:0
- name: Export `CI_CACHE_ID` from container
run: echo "CI_CACHE_ID=$(cat /.ci_cache_id)" >> $GITHUB_ENV
- uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
- uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
with:
path: ~/.cache/pre-commit
key: "${{ env.CI_CACHE_ID }}|\
Expand All @@ -61,13 +61,13 @@ jobs:
issues: write
pull-requests: write
checks: read
container: techneg/ci-semantic-release:v1.2.4@sha256:e7cfe36054a56382568c0824d2539a67a956711d7b674093db320815e928ee27
container: techneg/ci-semantic-release:v1.2.17@sha256:4db8d4b3b1451131ce77bd857254de2f3c5579172955b2a6a2d4ec4326789196
runs-on: ubuntu-latest
timeout-minutes: 15
steps:
- run: | # Needed due to bug actions/checkout#2031
git config --global --add safe.directory "$GITHUB_WORKSPACE"
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
# yamllint disable-line rule:line-length
- uses: poseidon/wait-for-status-checks@899c768d191b56eef585c18f8558da19e1f3e707 # v0.6.0
with:
Expand Down
86 changes: 43 additions & 43 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
stage_test: &stage_test 'test'
# `image`
# yamllint disable rule:line-length
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.103@sha256:3a2bf514e461769ed7b8880213e9637186bb7e17e0653b4a6ad3f249e4a60d33'
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.72@sha256:20873e73badc9d5ea93e20ef745f64fe957625a755a60c91e3dad600217e2c76'
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.72@sha256:20873e73badc9d5ea93e20ef745f64fe957625a755a60c91e3dad600217e2c76'
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.5.5@sha256:9d92b83a64378da3f9363668b0da244d9f12039d86579881d649ddb40ce261f3'
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:fe69f9642c7edde46bbd78326d2c42c6e13fc73694efb142e92e206725479328'
image_semantic-release: &image_semanticrelease 'techneg/ci-semantic-release:v1.2.4@sha256:e7cfe36054a56382568c0824d2539a67a956711d7b674093db320815e928ee27'
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.116@sha256:98d5550565bb2563901005fd07aabfa5be206db38c4b195ffce44d297ae2b84c'
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.86@sha256:0939b6184329615704d51e984af490c2339cc1a31a5db0cef252684cc6b8f8ea'
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.86@sha256:0939b6184329615704d51e984af490c2339cc1a31a5db0cef252684cc6b8f8ea'
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.5.19@sha256:64cb1f774a3d6abdd498f6be4b3dbe261f821e1dd088c00c23504f39d0c1cf03'
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:74850471782195453cdf91f4a5edf62b6fcc3365c124d4d975c7e87a702040d7'
image_semantic-release: &image_semanticrelease 'techneg/ci-semantic-release:v1.2.17@sha256:4db8d4b3b1451131ce77bd857254de2f3c5579172955b2a6a2d4ec4326789196'
# `services`
services_docker_dind: &services_docker_dind
- 'docker:28.3.3-dind@sha256:a56b3bdde89315ed2cc0e4906e582b5033d93bf20d9cb9510c2cdd4e7f7690b1'
- 'docker:29.1.1-dind@sha256:9b20eb23e1f0443655673efb9db76c4b18cc1b45de1fcf82b3c1b749b9647bdf'
# yamllint enable rule:line-length
# `variables`
# https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3
Expand Down Expand Up @@ -175,42 +175,42 @@ 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-7: {extends: '.test_instance'}
almalinux-8-3007-7: {extends: '.test_instance'}
amazonlinux-2023-3007-7: {extends: '.test_instance'}
amazonlinux-2-3007-7: {extends: '.test_instance_failure_permitted'}
centos-stream9-3007-7: {extends: '.test_instance'}
debian-12-3007-7: {extends: '.test_instance'}
debian-11-3007-7: {extends: '.test_instance'}
fedora-41-3007-7: {extends: '.test_instance_failure_permitted'}
fedora-40-3007-7: {extends: '.test_instance'}
opensuse-leap-156-3007-7: {extends: '.test_instance'}
opensuse-tmbl-latest-3007-7: {extends: '.test_instance'}
oraclelinux-9-3007-7: {extends: '.test_instance'}
oraclelinux-8-3007-7: {extends: '.test_instance'}
rockylinux-9-3007-7: {extends: '.test_instance'}
rockylinux-8-3007-7: {extends: '.test_instance'}
ubuntu-2404-3007-7: {extends: '.test_instance'}
ubuntu-2204-3007-7: {extends: '.test_instance'}
ubuntu-2004-3007-7: {extends: '.test_instance'}
almalinux-9-3006-15: {extends: '.test_instance'}
almalinux-8-3006-15: {extends: '.test_instance'}
amazonlinux-2023-3006-15: {extends: '.test_instance'}
amazonlinux-2-3006-15: {extends: '.test_instance_failure_permitted'}
centos-stream9-3006-15: {extends: '.test_instance'}
debian-12-3006-15: {extends: '.test_instance'}
debian-11-3006-15: {extends: '.test_instance'}
fedora-41-3006-15: {extends: '.test_instance_failure_permitted'}
fedora-40-3006-15: {extends: '.test_instance'}
opensuse-leap-156-3006-15: {extends: '.test_instance'}
opensuse-tmbl-latest-3006-15: {extends: '.test_instance'}
oraclelinux-9-3006-15: {extends: '.test_instance'}
oraclelinux-8-3006-15: {extends: '.test_instance'}
rockylinux-9-3006-15: {extends: '.test_instance'}
rockylinux-8-3006-15: {extends: '.test_instance'}
ubuntu-2404-3006-15: {extends: '.test_instance'}
ubuntu-2204-3006-15: {extends: '.test_instance'}
ubuntu-2004-3006-15: {extends: '.test_instance'}
almalinux-9-3007: {extends: '.test_instance'}
almalinux-8-3007: {extends: '.test_instance'}
amazonlinux-2023-3007: {extends: '.test_instance'}
amazonlinux-2-3007: {extends: '.test_instance_failure_permitted'}
centos-stream9-3007: {extends: '.test_instance'}
debian-12-3007: {extends: '.test_instance'}
debian-11-3007: {extends: '.test_instance'}
fedora-41-3007: {extends: '.test_instance_failure_permitted'}
fedora-40-3007: {extends: '.test_instance'}
opensuse-leap-156-3007: {extends: '.test_instance'}
opensuse-tmbl-latest-3007: {extends: '.test_instance'}
oraclelinux-9-3007: {extends: '.test_instance'}
oraclelinux-8-3007: {extends: '.test_instance'}
rockylinux-9-3007: {extends: '.test_instance'}
rockylinux-8-3007: {extends: '.test_instance'}
ubuntu-2404-3007: {extends: '.test_instance'}
ubuntu-2204-3007: {extends: '.test_instance'}
ubuntu-2004-3007: {extends: '.test_instance'}
almalinux-9-3006: {extends: '.test_instance'}
almalinux-8-3006: {extends: '.test_instance'}
amazonlinux-2023-3006: {extends: '.test_instance'}
amazonlinux-2-3006: {extends: '.test_instance_failure_permitted'}
centos-stream9-3006: {extends: '.test_instance'}
debian-12-3006: {extends: '.test_instance'}
debian-11-3006: {extends: '.test_instance'}
fedora-41-3006: {extends: '.test_instance_failure_permitted'}
fedora-40-3006: {extends: '.test_instance'}
opensuse-leap-156-3006: {extends: '.test_instance'}
opensuse-tmbl-latest-3006: {extends: '.test_instance'}
oraclelinux-9-3006: {extends: '.test_instance'}
oraclelinux-8-3006: {extends: '.test_instance'}
rockylinux-9-3006: {extends: '.test_instance'}
rockylinux-8-3006: {extends: '.test_instance'}
ubuntu-2404-3006: {extends: '.test_instance'}
ubuntu-2204-3006: {extends: '.test_instance'}
ubuntu-2004-3006: {extends: '.test_instance'}
# yamllint enable rule:line-length

###############################################################################
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ repos:
- id: commitlint
- id: commitlint-ci
- repo: https://github.com/rubocop-hq/rubocop
rev: v1.80.1
rev: v1.81.7
hooks:
- id: rubocop
name: Check Ruby files with rubocop
Expand Down Expand Up @@ -100,12 +100,12 @@ repos:
)$
additional_dependencies: [pygments==2.16.1]
- repo: https://github.com/renovatebot/pre-commit-hooks
rev: 41.93.2
rev: 42.29.5
hooks:
- id: renovate-config-validator
name: Check Renovate config with renovate-config-validator
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.33.3
rev: 0.35.0
hooks:
- id: check-github-workflows
name: Check GitHub workflows with check-jsonschema
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ gem 'inspec', git: 'https://gitlab.com/saltstack-formulas/infrastructure/inspec'
# improvement: avoid package installations which are already covered by the
# `salt-image-builder` (i.e. the pre-salted images that we're using)
# rubocop:disable Layout/LineLength
gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf'
gem 'kitchen-docker', git: 'https://github.com/test-kitchen/kitchen-docker', ref: '511e4ad36856b9e2eccceb56603586e6cebd296a'
# rubocop:enable Layout/LineLength

gem 'kitchen-inspec', '3.0.0'
Expand All @@ -21,4 +21,4 @@ gem 'kitchen-salt', '0.7.2'
# Avoid the error 'pkeys are immutable on OpenSSL 3.0'
gem 'net-ssh', '>= 7.0.0'

gem 'test-kitchen', '3.7.0'
gem 'test-kitchen', '3.9.0'
58 changes: 43 additions & 15 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
GIT
remote: https://github.com/test-kitchen/kitchen-docker
revision: 511e4ad36856b9e2eccceb56603586e6cebd296a
ref: 511e4ad36856b9e2eccceb56603586e6cebd296a
specs:
kitchen-docker (3.0.0)
test-kitchen (>= 1.0.0, < 4.0)

GIT
remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
revision: a0c6295303f7d7a4d2a6164b5e77868560b04945
Expand Down Expand Up @@ -40,14 +48,6 @@ GIT
tty-prompt (~> 0.17)
tty-table (~> 0.10)

GIT
remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker
revision: 104079a1d2fe34f5b076f4d316f6f837fa76e412
branch: ssf
specs:
kitchen-docker (2.13.0)
test-kitchen (>= 1.0.0)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -322,13 +322,14 @@ GEM
ms_rest_azure (~> 0.12.0)
azure_mgmt_storage (0.23.0)
ms_rest_azure (~> 0.12.0)
base64 (0.2.0)
base64 (0.3.0)
bcrypt_pbkdf (1.1.1)
bcrypt_pbkdf (1.1.1-x64-mingw-ucrt)
benchmark (0.4.0)
bigdecimal (3.1.9)
bigdecimal (3.3.1)
bson (4.15.0)
builder (3.3.0)
cgi (0.5.0)
chef-config (18.7.6)
addressable
chef-utils (= 18.7.6)
Expand Down Expand Up @@ -369,6 +370,8 @@ GEM
connection_pool (2.5.3)
cookstyle (8.1.2)
rubocop (= 1.75.5)
csv (3.3.5)
date (3.5.0)
declarative (0.0.20)
diff-lcs (1.6.2)
docker-api (2.4.0)
Expand All @@ -377,6 +380,8 @@ GEM
domain_name (0.6.20240107)
drb (2.2.1)
ed25519 (1.4.0)
erb (4.0.4)
cgi (>= 0.3.3)
erubi (1.13.1)
excon (1.2.5)
logger
Expand Down Expand Up @@ -459,6 +464,10 @@ GEM
concurrent-ruby (~> 1.0)
inifile (3.0.0)
io-console (0.8.0)
irb (1.15.3)
pp (>= 0.6.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
jmespath (1.6.2)
json (2.12.0)
jwt (2.10.1)
Expand Down Expand Up @@ -513,7 +522,7 @@ GEM
faraday (>= 0.9, < 2.0.0)
faraday-cookie_jar (~> 0.0.6)
ms_rest (~> 0.7.6)
multi_json (1.15.0)
multi_json (1.17.0)
multipart-post (2.4.1)
mutex_m (0.3.0)
net-scp (4.1.0)
Expand All @@ -530,24 +539,35 @@ GEM
bigdecimal
options (2.3.2)
os (1.1.4)
ostruct (0.6.3)
parallel (1.27.0)
parser (3.3.8.0)
ast (~> 2.4.1)
racc
parslet (1.8.2)
pastel (0.8.0)
tty-color (~> 0.5)
pp (0.6.3)
prettyprint
prettyprint (0.2.0)
prism (1.4.0)
progress_bar (1.3.4)
highline (>= 1.6)
options (~> 2.3.0)
pry (0.15.2)
coderay (~> 1.1)
method_source (~> 1.0)
psych (5.2.6)
date
stringio
public_suffix (6.0.2)
racc (1.8.1)
rainbow (3.1.1)
rake (13.2.1)
rdoc (6.16.1)
erb
psych (>= 4.0.0)
tsort
regexp_parser (2.10.0)
reline (0.6.1)
io-console (~> 0.5)
Expand All @@ -556,7 +576,7 @@ GEM
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.4.1)
rexml (3.4.4)
roo (2.9.0)
nokogiri (~> 1)
rubyzip (>= 1.3.0, < 3.0.0)
Expand Down Expand Up @@ -612,21 +632,28 @@ GEM
logger
ruby-ole
sslshake (1.3.1)
stringio (3.1.8)
strings (0.2.1)
strings-ansi (~> 0.2)
unicode-display_width (>= 1.5, < 3.0)
unicode_utils (~> 1.4)
strings-ansi (0.2.0)
test-kitchen (3.7.0)
syslog (0.3.0)
logger
test-kitchen (3.9.0)
bcrypt_pbkdf (~> 1.0)
chef-utils (>= 16.4.35)
ed25519 (~> 1.2)
csv (~> 3.3)
ed25519 (~> 1.3)
irb (~> 1.15)
license-acceptance (>= 1.0.11, < 3.0)
mixlib-install (~> 3.6)
mixlib-shellout (>= 1.2, < 4.0)
net-scp (>= 1.1, < 5.0)
net-ssh (>= 2.9, < 8.0)
net-ssh-gateway (>= 1.2, < 3.0)
ostruct (~> 0.6)
syslog (~> 0.3)
thor (>= 0.19, < 2.0)
winrm (~> 2.0)
winrm-elevated (~> 1.0)
Expand Down Expand Up @@ -747,6 +774,7 @@ GEM
chef-winrm (~> 2.3.12)
chef-winrm-elevated (~> 1.2.5)
chef-winrm-fs (~> 1.3.7)
tsort (0.2.0)
tty-box (0.7.0)
pastel (~> 0.8)
strings (~> 0.2.0)
Expand Down Expand Up @@ -804,7 +832,7 @@ DEPENDENCIES
kitchen-inspec (= 3.0.0)
kitchen-salt (= 0.7.2)
net-ssh (>= 7.0.0)
test-kitchen (= 3.7.0)
test-kitchen (= 3.9.0)

BUNDLED WITH
2.3.7
Loading
Loading