Skip to content

Commit 6592163

Browse files
dafyddjdafyddj
authored
Merge pull request #142 from saltstack-formulas/renovate/https-github.com-dafyddj-copier-ssf-ci-2.x
chore(copier): update template https://github.com/dafyddj/copier-ssf-ci to v2.1.0
2 parents 908089d + af704a4 commit 6592163

File tree

6 files changed

+140
-120
lines changed

6 files changed

+140
-120
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.0.1
2+
_commit: v2.1.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: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,19 @@ jobs:
2727
name: Lint / `pre-commit`
2828
needs: should-run
2929
if: fromJSON(needs.should-run.outputs.should-run)
30-
container: techneg/ci-pre-commit:v2.3.3
30+
# yamllint disable-line rule:line-length
31+
container: techneg/ci-pre-commit:v2.4.25@sha256:ff5192e893c1079fbf70e3ce6bfc3773815041786a75659793158be930ba7803
3132
runs-on: ubuntu-latest
3233
timeout-minutes: 5
3334
steps:
3435
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
36+
with:
37+
fetch-depth: 0
38+
fetch-tags: true
39+
filter: tree:0
3540
- name: Export `CI_CACHE_ID` from container
3641
run: echo "CI_CACHE_ID=$(cat /.ci_cache_id)" >> $GITHUB_ENV
37-
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
42+
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
3843
with:
3944
path: ~/.cache/pre-commit
4045
key: "${{ env.CI_CACHE_ID }}|\

‎.gitlab-ci.yml‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -187,42 +187,42 @@ rockylinux-8-master: {extends: '.test_instance_failure_permitted'}
187187
ubuntu-2404-master: {extends: '.test_instance_failure_permitted'}
188188
ubuntu-2204-master: {extends: '.test_instance_failure_permitted'}
189189
ubuntu-2004-master: {extends: '.test_instance_failure_permitted'}
190-
almalinux-9-3007-3: {extends: '.test_instance'}
191-
almalinux-8-3007-3: {extends: '.test_instance'}
192-
amazonlinux-2023-3007-3: {extends: '.test_instance'}
193-
amazonlinux-2-3007-3: {extends: '.test_instance_failure_permitted'}
194-
centos-stream9-3007-3: {extends: '.test_instance'}
195-
debian-12-3007-3: {extends: '.test_instance'}
196-
debian-11-3007-3: {extends: '.test_instance'}
197-
fedora-41-3007-3: {extends: '.test_instance_failure_permitted'}
198-
fedora-40-3007-3: {extends: '.test_instance'}
199-
opensuse-leap-156-3007-3: {extends: '.test_instance'}
200-
opensuse-tmbl-latest-3007-3: {extends: '.test_instance'}
201-
oraclelinux-9-3007-3: {extends: '.test_instance'}
202-
oraclelinux-8-3007-3: {extends: '.test_instance'}
203-
rockylinux-9-3007-3: {extends: '.test_instance'}
204-
rockylinux-8-3007-3: {extends: '.test_instance'}
205-
ubuntu-2404-3007-3: {extends: '.test_instance'}
206-
ubuntu-2204-3007-3: {extends: '.test_instance'}
207-
ubuntu-2004-3007-3: {extends: '.test_instance'}
208-
almalinux-9-3006-11: {extends: '.test_instance'}
209-
almalinux-8-3006-11: {extends: '.test_instance'}
210-
amazonlinux-2023-3006-11: {extends: '.test_instance'}
211-
amazonlinux-2-3006-11: {extends: '.test_instance_failure_permitted'}
212-
centos-stream9-3006-11: {extends: '.test_instance'}
213-
debian-12-3006-11: {extends: '.test_instance'}
214-
debian-11-3006-11: {extends: '.test_instance'}
215-
fedora-41-3006-11: {extends: '.test_instance_failure_permitted'}
216-
fedora-40-3006-11: {extends: '.test_instance'}
217-
opensuse-leap-156-3006-11: {extends: '.test_instance'}
218-
opensuse-tmbl-latest-3006-11: {extends: '.test_instance'}
219-
oraclelinux-9-3006-11: {extends: '.test_instance'}
220-
oraclelinux-8-3006-11: {extends: '.test_instance'}
221-
rockylinux-9-3006-11: {extends: '.test_instance'}
222-
rockylinux-8-3006-11: {extends: '.test_instance'}
223-
ubuntu-2404-3006-11: {extends: '.test_instance'}
224-
ubuntu-2204-3006-11: {extends: '.test_instance'}
225-
ubuntu-2004-3006-11: {extends: '.test_instance'}
190+
almalinux-9-3007-4: {extends: '.test_instance'}
191+
almalinux-8-3007-4: {extends: '.test_instance'}
192+
amazonlinux-2023-3007-4: {extends: '.test_instance'}
193+
amazonlinux-2-3007-4: {extends: '.test_instance_failure_permitted'}
194+
centos-stream9-3007-4: {extends: '.test_instance'}
195+
debian-12-3007-4: {extends: '.test_instance'}
196+
debian-11-3007-4: {extends: '.test_instance'}
197+
fedora-41-3007-4: {extends: '.test_instance_failure_permitted'}
198+
fedora-40-3007-4: {extends: '.test_instance'}
199+
opensuse-leap-156-3007-4: {extends: '.test_instance'}
200+
opensuse-tmbl-latest-3007-4: {extends: '.test_instance'}
201+
oraclelinux-9-3007-4: {extends: '.test_instance'}
202+
oraclelinux-8-3007-4: {extends: '.test_instance'}
203+
rockylinux-9-3007-4: {extends: '.test_instance'}
204+
rockylinux-8-3007-4: {extends: '.test_instance'}
205+
ubuntu-2404-3007-4: {extends: '.test_instance'}
206+
ubuntu-2204-3007-4: {extends: '.test_instance'}
207+
ubuntu-2004-3007-4: {extends: '.test_instance'}
208+
almalinux-9-3006-12: {extends: '.test_instance'}
209+
almalinux-8-3006-12: {extends: '.test_instance'}
210+
amazonlinux-2023-3006-12: {extends: '.test_instance'}
211+
amazonlinux-2-3006-12: {extends: '.test_instance_failure_permitted'}
212+
centos-stream9-3006-12: {extends: '.test_instance'}
213+
debian-12-3006-12: {extends: '.test_instance'}
214+
debian-11-3006-12: {extends: '.test_instance'}
215+
fedora-41-3006-12: {extends: '.test_instance_failure_permitted'}
216+
fedora-40-3006-12: {extends: '.test_instance'}
217+
opensuse-leap-156-3006-12: {extends: '.test_instance'}
218+
opensuse-tmbl-latest-3006-12: {extends: '.test_instance'}
219+
oraclelinux-9-3006-12: {extends: '.test_instance'}
220+
oraclelinux-8-3006-12: {extends: '.test_instance'}
221+
rockylinux-9-3006-12: {extends: '.test_instance'}
222+
rockylinux-8-3006-12: {extends: '.test_instance'}
223+
ubuntu-2404-3006-12: {extends: '.test_instance'}
224+
ubuntu-2204-3006-12: {extends: '.test_instance'}
225+
ubuntu-2004-3006-12: {extends: '.test_instance'}
226226
# yamllint enable rule:line-length
227227

228228
###############################################################################

‎Gemfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ gem 'inspec', git: 'https://gitlab.com/saltstack-formulas/infrastructure/inspec'
1515
gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf'
1616
# rubocop:enable Layout/LineLength
1717

18-
gem 'kitchen-inspec', '2.6.2'
18+
gem 'kitchen-inspec', '3.0.0'
1919
gem 'kitchen-salt', '0.7.2'
2020

2121
# Avoid the error 'pkeys are immutable on OpenSSL 3.0'
2222
gem 'net-ssh', '>= 7.0.0'
2323

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

‎Gemfile.lock‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,7 @@ GEM
324324
ms_rest_azure (~> 0.12.0)
325325
base64 (0.2.0)
326326
bcrypt_pbkdf (1.1.1)
327+
bcrypt_pbkdf (1.1.1-x64-mingw-ucrt)
327328
benchmark (0.4.0)
328329
bigdecimal (3.1.9)
329330
bson (4.15.0)
@@ -410,6 +411,9 @@ GEM
410411
faraday_middleware (1.0.0)
411412
faraday (~> 1.0)
412413
ffi (1.16.3)
414+
ffi (1.16.3-x64-mingw-ucrt)
415+
ffi-win32-extensions (1.0.4)
416+
ffi
413417
fuzzyurl (0.9.0)
414418
google-apis-admin_directory_v1 (0.46.0)
415419
google-apis-core (>= 0.11.0, < 2.a)
@@ -459,9 +463,9 @@ GEM
459463
json (2.12.0)
460464
jwt (2.10.1)
461465
base64
462-
kitchen-inspec (2.6.2)
466+
kitchen-inspec (3.0.0)
463467
hashie (>= 3.4, <= 5.0)
464-
inspec (>= 2.2.64, < 6.0)
468+
inspec (>= 2.2.64, < 7.0)
465469
test-kitchen (>= 2.7, < 4)
466470
kitchen-salt (0.7.2)
467471
hashie (>= 3.5)
@@ -492,6 +496,11 @@ GEM
492496
ffi (>= 1.15.5)
493497
mixlib-shellout (3.3.9)
494498
chef-utils
499+
mixlib-shellout (3.3.9-x64-mingw-ucrt)
500+
chef-utils
501+
ffi-win32-extensions (~> 1.0.3)
502+
win32-process (~> 0.9)
503+
wmi-lite (~> 1.0)
495504
mixlib-versioning (1.2.12)
496505
mongo (2.13.2)
497506
bson (>= 4.8.2, < 5.0.0)
@@ -515,6 +524,8 @@ GEM
515524
nokogiri (1.18.8)
516525
mini_portile2 (~> 2.8.2)
517526
racc (~> 1.4)
527+
nokogiri (1.18.8-x64-mingw-ucrt)
528+
racc (~> 1.4)
518529
nori (2.7.0)
519530
bigdecimal
520531
options (2.3.2)
@@ -606,7 +617,7 @@ GEM
606617
unicode-display_width (>= 1.5, < 3.0)
607618
unicode_utils (~> 1.4)
608619
strings-ansi (0.2.0)
609-
test-kitchen (3.6.0)
620+
test-kitchen (3.7.0)
610621
bcrypt_pbkdf (~> 1.0)
611622
chef-utils (>= 16.4.35)
612623
ed25519 (~> 1.2)
@@ -759,6 +770,8 @@ GEM
759770
uber (0.1.0)
760771
unicode-display_width (2.6.0)
761772
unicode_utils (1.4.0)
773+
win32-process (0.10.0)
774+
ffi (>= 1.0.0)
762775
winrm (2.3.8)
763776
builder (>= 2.1.2)
764777
erubi (~> 1.8)
@@ -779,17 +792,19 @@ GEM
779792
rubyzip (~> 2.0)
780793
winrm (~> 2.0)
781794
wisper (2.0.1)
795+
wmi-lite (1.0.7)
782796

783797
PLATFORMS
784798
ruby
799+
x64-mingw-ucrt
785800

786801
DEPENDENCIES
787802
inspec!
788803
kitchen-docker!
789-
kitchen-inspec (= 2.6.2)
804+
kitchen-inspec (= 3.0.0)
790805
kitchen-salt (= 0.7.2)
791806
net-ssh (>= 7.0.0)
792-
test-kitchen (= 3.6.0)
807+
test-kitchen (= 3.7.0)
793808

794809
BUNDLED WITH
795810
2.3.7

0 commit comments

Comments
 (0)