Skip to content

Commit bc802a1

Browse files
chore(copier): update template https://github.com/dafyddj/copier-ssf-ci to v2.9.0
1 parent 543b40c commit bc802a1

File tree

9 files changed

+221
-184
lines changed

9 files changed

+221
-184
lines changed

.copier-answers.ssf-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
2-
_commit: v2.7.3
2+
_commit: v2.9.0
33
_src_path: https://github.com/dafyddj/copier-ssf-ci
44
failure_permitted_ignored: []
55
failure_permitted_patterns: []

.github/workflows/main.yml

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,31 @@ jobs:
2525
name: Lint / `pre-commit`
2626
needs: should-run
2727
if: fromJSON(needs.should-run.outputs.should-run)
28-
container: techneg/ci-pre-commit:v2.5.2@sha256:af1cccdd8afe64bbeac5216e3c243e2c3f716f665edf8487a9e920cbfb85c1fb
28+
container: techneg/ci-pre-commit:v2.5.17@sha256:1334a7a0ef8b22fdc7933088112bfebfaf6d6733a394a63e236e924f8e8aff54
2929
runs-on: ubuntu-latest
3030
timeout-minutes: 10
3131
steps:
3232
- run: | # Needed because of bug #2031 in `actions/checkout`
3333
git config --global --add safe.directory "$GITHUB_WORKSPACE"
34-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
34+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
3535
with:
3636
fetch-depth: 0
3737
fetch-tags: true
3838
filter: tree:0
3939
- name: Export `CI_CACHE_ID` from container
4040
run: echo "CI_CACHE_ID=$(cat /.ci_cache_id)" >> $GITHUB_ENV
41-
- uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
41+
- uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
4242
with:
4343
path: ~/.cache/pre-commit
4444
key: "${{ env.CI_CACHE_ID }}|\
4545
${{ hashFiles('.pre-commit-config.yaml') }}"
4646
restore-keys: |
4747
${{ env.CI_CACHE_ID }}|
4848
- name: Build cache
49-
shell: bash
5049
run: |
5150
pre-commit gc
52-
echo "Installing hook environments"
53-
time pre-commit install-hooks
51+
echo "Installing hook environments..."
52+
time -f "Hook installation took %E" pre-commit install-hooks
5453
- name: Run `pre-commit`
5554
run: |
5655
pre-commit run --all-files --color always --verbose
@@ -72,24 +71,24 @@ jobs:
7271
- ubuntu-2404-master
7372
- ubuntu-2204-master
7473
- ubuntu-2004-master
75-
- debian-12-3007-6
76-
- debian-11-3007-6
77-
- ubuntu-2404-3007-6
78-
- ubuntu-2204-3007-6
79-
- ubuntu-2004-3007-6
80-
- debian-12-3006-14
81-
- debian-11-3006-14
82-
- ubuntu-2404-3006-14
83-
- ubuntu-2204-3006-14
84-
- ubuntu-2004-3006-14
74+
- debian-12-3007
75+
- debian-11-3007
76+
- ubuntu-2404-3007
77+
- ubuntu-2204-3007
78+
- ubuntu-2004-3007
79+
- debian-12-3006
80+
- debian-11-3006
81+
- ubuntu-2404-3006
82+
- ubuntu-2204-3006
83+
- ubuntu-2004-3006
8584
steps:
8685
- name: Debug on runner (When re-run with "Enable debug logging" checked)
8786
if: runner.debug
88-
uses: mxschmitt/action-tmate@7b6a61a73bbb9793cb80ad69b8dd8ac19261834c # v3.22
87+
uses: mxschmitt/action-tmate@c0afd6f790e3a5564914980036ebf83216678101 # v3.23
8988
with:
9089
detached: true
91-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
92-
- uses: ruby/setup-ruby@829114fc20da43a41d27359103ec7a63020954d4 # v1.255.0
90+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
91+
- uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # v1.268.0
9392
with:
9493
bundler-cache: true
9594
ruby-version: '3.1'
@@ -102,13 +101,13 @@ jobs:
102101
issues: write
103102
pull-requests: write
104103
checks: read
105-
container: techneg/ci-semantic-release:v1.2.1@sha256:d23338a31ae979a4d15b9b4c68c3dea0795210956d2c43dc6eab1791483b7607
104+
container: techneg/ci-semantic-release:v1.2.16@sha256:48234e3cd479efc11f82060702c7f6dc6ef0b4db9cf8189bedb6a86bcdd05e31
106105
runs-on: ubuntu-latest
107106
timeout-minutes: 15
108107
steps:
109108
- run: | # Needed due to bug actions/checkout#2031
110109
git config --global --add safe.directory "$GITHUB_WORKSPACE"
111-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
110+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
112111
# yamllint disable-line rule:line-length
113112
- uses: poseidon/wait-for-status-checks@899c768d191b56eef585c18f8558da19e1f3e707 # v0.6.0
114113
with:

.gitlab-ci.yml

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
stage_test: &stage_test 'test'
1616
# `image`
1717
# yamllint disable rule:line-length
18-
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.100@sha256:cdcfb678d97a38dc1bdb7010935e5e7e6515131812c76c32a78307860bf8193e'
19-
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.69@sha256:73b50339c27f37232edd5442ed02578dcca653bbac3c7335f6ccd576b5bbadf3'
20-
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.69@sha256:73b50339c27f37232edd5442ed02578dcca653bbac3c7335f6ccd576b5bbadf3'
21-
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.5.2@sha256:af1cccdd8afe64bbeac5216e3c243e2c3f716f665edf8487a9e920cbfb85c1fb'
22-
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:fe69f9642c7edde46bbd78326d2c42c6e13fc73694efb142e92e206725479328'
23-
image_semantic-release: &image_semanticrelease 'techneg/ci-semantic-release:v1.2.1@sha256:d23338a31ae979a4d15b9b4c68c3dea0795210956d2c43dc6eab1791483b7607'
18+
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.115@sha256:0294e12b860e6467d57868d884df31898f33e3899d739e01e6ed86fc6c1aad62'
19+
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.85@sha256:e5dc07cdc39d5903d9da29c64e7e24441de773069f83b2b67e93192d602d9adb'
20+
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.85@sha256:e5dc07cdc39d5903d9da29c64e7e24441de773069f83b2b67e93192d602d9adb'
21+
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.5.18@sha256:faf42c5a068a49bf395978a5a8b354051e510b6470c39aef569e6f17750a1ac3'
22+
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:74850471782195453cdf91f4a5edf62b6fcc3365c124d4d975c7e87a702040d7'
23+
image_semantic-release: &image_semanticrelease 'techneg/ci-semantic-release:v1.2.16@sha256:48234e3cd479efc11f82060702c7f6dc6ef0b4db9cf8189bedb6a86bcdd05e31'
2424
# `services`
2525
services_docker_dind: &services_docker_dind
26-
- 'docker:28.3.3-dind@sha256:c0872aae4791ff427e6eda52769afa04f17b5cf756f8267e0d52774c99d5c9de'
26+
- 'docker:29.0.4-dind@sha256:c9699f4fc7365e8daad3eb48ce3b62dc118b2a5267f7be7bcd3c4e4b2f1cfb4c'
2727
# yamllint enable rule:line-length
2828
# `variables`
2929
# https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3
@@ -175,42 +175,42 @@ rockylinux-8-master: {extends: '.test_instance_failure_permitted'}
175175
ubuntu-2404-master: {extends: '.test_instance_failure_permitted'}
176176
ubuntu-2204-master: {extends: '.test_instance_failure_permitted'}
177177
ubuntu-2004-master: {extends: '.test_instance_failure_permitted'}
178-
almalinux-9-3007-6: {extends: '.test_instance'}
179-
almalinux-8-3007-6: {extends: '.test_instance'}
180-
amazonlinux-2023-3007-6: {extends: '.test_instance'}
181-
amazonlinux-2-3007-6: {extends: '.test_instance_failure_permitted'}
182-
centos-stream9-3007-6: {extends: '.test_instance'}
183-
debian-12-3007-6: {extends: '.test_instance'}
184-
debian-11-3007-6: {extends: '.test_instance'}
185-
fedora-41-3007-6: {extends: '.test_instance_failure_permitted'}
186-
fedora-40-3007-6: {extends: '.test_instance'}
187-
opensuse-leap-156-3007-6: {extends: '.test_instance'}
188-
opensuse-tmbl-latest-3007-6: {extends: '.test_instance'}
189-
oraclelinux-9-3007-6: {extends: '.test_instance'}
190-
oraclelinux-8-3007-6: {extends: '.test_instance'}
191-
rockylinux-9-3007-6: {extends: '.test_instance'}
192-
rockylinux-8-3007-6: {extends: '.test_instance'}
193-
ubuntu-2404-3007-6: {extends: '.test_instance'}
194-
ubuntu-2204-3007-6: {extends: '.test_instance'}
195-
ubuntu-2004-3007-6: {extends: '.test_instance'}
196-
almalinux-9-3006-14: {extends: '.test_instance'}
197-
almalinux-8-3006-14: {extends: '.test_instance'}
198-
amazonlinux-2023-3006-14: {extends: '.test_instance'}
199-
amazonlinux-2-3006-14: {extends: '.test_instance_failure_permitted'}
200-
centos-stream9-3006-14: {extends: '.test_instance'}
201-
debian-12-3006-14: {extends: '.test_instance'}
202-
debian-11-3006-14: {extends: '.test_instance'}
203-
fedora-41-3006-14: {extends: '.test_instance_failure_permitted'}
204-
fedora-40-3006-14: {extends: '.test_instance'}
205-
opensuse-leap-156-3006-14: {extends: '.test_instance'}
206-
opensuse-tmbl-latest-3006-14: {extends: '.test_instance'}
207-
oraclelinux-9-3006-14: {extends: '.test_instance'}
208-
oraclelinux-8-3006-14: {extends: '.test_instance'}
209-
rockylinux-9-3006-14: {extends: '.test_instance'}
210-
rockylinux-8-3006-14: {extends: '.test_instance'}
211-
ubuntu-2404-3006-14: {extends: '.test_instance'}
212-
ubuntu-2204-3006-14: {extends: '.test_instance'}
213-
ubuntu-2004-3006-14: {extends: '.test_instance'}
178+
almalinux-9-3007: {extends: '.test_instance'}
179+
almalinux-8-3007: {extends: '.test_instance'}
180+
amazonlinux-2023-3007: {extends: '.test_instance'}
181+
amazonlinux-2-3007: {extends: '.test_instance_failure_permitted'}
182+
centos-stream9-3007: {extends: '.test_instance'}
183+
debian-12-3007: {extends: '.test_instance'}
184+
debian-11-3007: {extends: '.test_instance'}
185+
fedora-41-3007: {extends: '.test_instance_failure_permitted'}
186+
fedora-40-3007: {extends: '.test_instance'}
187+
opensuse-leap-156-3007: {extends: '.test_instance'}
188+
opensuse-tmbl-latest-3007: {extends: '.test_instance'}
189+
oraclelinux-9-3007: {extends: '.test_instance'}
190+
oraclelinux-8-3007: {extends: '.test_instance'}
191+
rockylinux-9-3007: {extends: '.test_instance'}
192+
rockylinux-8-3007: {extends: '.test_instance'}
193+
ubuntu-2404-3007: {extends: '.test_instance'}
194+
ubuntu-2204-3007: {extends: '.test_instance'}
195+
ubuntu-2004-3007: {extends: '.test_instance'}
196+
almalinux-9-3006: {extends: '.test_instance'}
197+
almalinux-8-3006: {extends: '.test_instance'}
198+
amazonlinux-2023-3006: {extends: '.test_instance'}
199+
amazonlinux-2-3006: {extends: '.test_instance_failure_permitted'}
200+
centos-stream9-3006: {extends: '.test_instance'}
201+
debian-12-3006: {extends: '.test_instance'}
202+
debian-11-3006: {extends: '.test_instance'}
203+
fedora-41-3006: {extends: '.test_instance_failure_permitted'}
204+
fedora-40-3006: {extends: '.test_instance'}
205+
opensuse-leap-156-3006: {extends: '.test_instance'}
206+
opensuse-tmbl-latest-3006: {extends: '.test_instance'}
207+
oraclelinux-9-3006: {extends: '.test_instance'}
208+
oraclelinux-8-3006: {extends: '.test_instance'}
209+
rockylinux-9-3006: {extends: '.test_instance'}
210+
rockylinux-8-3006: {extends: '.test_instance'}
211+
ubuntu-2404-3006: {extends: '.test_instance'}
212+
ubuntu-2204-3006: {extends: '.test_instance'}
213+
ubuntu-2004-3006: {extends: '.test_instance'}
214214
# yamllint enable rule:line-length
215215

216216
###############################################################################

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ repos:
3030
- id: commitlint
3131
- id: commitlint-ci
3232
- repo: https://github.com/rubocop-hq/rubocop
33-
rev: v1.79.2
33+
rev: v1.81.7
3434
hooks:
3535
- id: rubocop
3636
name: Check Ruby files with rubocop
@@ -100,12 +100,12 @@ repos:
100100
)$
101101
additional_dependencies: [pygments==2.16.1]
102102
- repo: https://github.com/renovatebot/pre-commit-hooks
103-
rev: 41.63.0
103+
rev: 42.19.8
104104
hooks:
105105
- id: renovate-config-validator
106106
name: Check Renovate config with renovate-config-validator
107107
- repo: https://github.com/python-jsonschema/check-jsonschema
108-
rev: 0.33.2
108+
rev: 0.35.0
109109
hooks:
110110
- id: check-github-workflows
111111
name: Check GitHub workflows with check-jsonschema

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ gem 'inspec', git: 'https://gitlab.com/saltstack-formulas/infrastructure/inspec'
1212
# improvement: avoid package installations which are already covered by the
1313
# `salt-image-builder` (i.e. the pre-salted images that we're using)
1414
# rubocop:disable Layout/LineLength
15-
gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf'
15+
gem 'kitchen-docker', git: 'https://github.com/test-kitchen/kitchen-docker', ref: '511e4ad36856b9e2eccceb56603586e6cebd296a'
1616
# rubocop:enable Layout/LineLength
1717

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

24-
gem 'test-kitchen', '3.7.0'
24+
gem 'test-kitchen', '3.9.0'

0 commit comments

Comments
 (0)