Skip to content

Commit 0ef7900

Browse files
jeff350jeff350
authored
Merge pull request #144 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.4.0
2 parents fb7253e + abaa64f commit 0ef7900

File tree

8 files changed

+242
-227
lines changed

8 files changed

+242
-227
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.2.1
2+
_commit: v2.4.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: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,12 @@ 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.4.26@sha256:60f5e15b35fd93a16bff63a6af078f2e61ca06baf1db18a7b30ebaf121f309ba
28+
container: techneg/ci-pre-commit:v2.4.28@sha256:3a5b362f2fdf60e3a6c614a919c67cc8ae5d34208e287d293fc30c150a919ac6
2929
runs-on: ubuntu-latest
3030
timeout-minutes: 5
3131
steps:
32+
- run: | # Needed because of bug #2031 in `actions/checkout`
33+
git config --global --add safe.directory "$GITHUB_WORKSPACE"
3234
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3335
with:
3436
fetch-depth: 0
@@ -41,11 +43,18 @@ jobs:
4143
path: ~/.cache/pre-commit
4244
key: "${{ env.CI_CACHE_ID }}|\
4345
${{ 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
4454
- name: Run `pre-commit`
4555
run: |
46-
git config --global --add safe.directory $(pwd)
4756
pre-commit run --all-files --color always --verbose
48-
pre-commit run --color always --hook-stage manual commitlint-ci
57+
pre-commit run --color always --hook-stage manual --verbose commitlint-ci
4958
results:
5059
name: Release / Collect results
5160
permissions:

‎.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.92@sha256:ba54dd413413f05cb3520a1cc160a7f61cc3ec8242914ae3673d3dfa409f0b94'
19-
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.61@sha256:9fa0e0b1c0364a9be92e1f80d3817bc794ed2fe4dc93c8850bab03cd170cbea0'
20-
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.61@sha256:9fa0e0b1c0364a9be92e1f80d3817bc794ed2fe4dc93c8850bab03cd170cbea0'
21-
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.26@sha256:60f5e15b35fd93a16bff63a6af078f2e61ca06baf1db18a7b30ebaf121f309ba'
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:ff052514f359111edd920b54581e7aca65629458607f9fbdbf82d7eefbe0602b'
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
@@ -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-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'}
190+
almalinux-9-3007-5: {extends: '.test_instance'}
191+
almalinux-8-3007-5: {extends: '.test_instance'}
192+
amazonlinux-2023-3007-5: {extends: '.test_instance'}
193+
amazonlinux-2-3007-5: {extends: '.test_instance_failure_permitted'}
194+
centos-stream9-3007-5: {extends: '.test_instance'}
195+
debian-12-3007-5: {extends: '.test_instance'}
196+
debian-11-3007-5: {extends: '.test_instance'}
197+
fedora-41-3007-5: {extends: '.test_instance_failure_permitted'}
198+
fedora-40-3007-5: {extends: '.test_instance'}
199+
opensuse-leap-156-3007-5: {extends: '.test_instance'}
200+
opensuse-tmbl-latest-3007-5: {extends: '.test_instance'}
201+
oraclelinux-9-3007-5: {extends: '.test_instance'}
202+
oraclelinux-8-3007-5: {extends: '.test_instance'}
203+
rockylinux-9-3007-5: {extends: '.test_instance'}
204+
rockylinux-8-3007-5: {extends: '.test_instance'}
205+
ubuntu-2404-3007-5: {extends: '.test_instance'}
206+
ubuntu-2204-3007-5: {extends: '.test_instance'}
207+
ubuntu-2004-3007-5: {extends: '.test_instance'}
208+
almalinux-9-3006-13: {extends: '.test_instance'}
209+
almalinux-8-3006-13: {extends: '.test_instance'}
210+
amazonlinux-2023-3006-13: {extends: '.test_instance'}
211+
amazonlinux-2-3006-13: {extends: '.test_instance_failure_permitted'}
212+
centos-stream9-3006-13: {extends: '.test_instance'}
213+
debian-12-3006-13: {extends: '.test_instance'}
214+
debian-11-3006-13: {extends: '.test_instance'}
215+
fedora-41-3006-13: {extends: '.test_instance_failure_permitted'}
216+
fedora-40-3006-13: {extends: '.test_instance'}
217+
opensuse-leap-156-3006-13: {extends: '.test_instance'}
218+
opensuse-tmbl-latest-3006-13: {extends: '.test_instance'}
219+
oraclelinux-9-3006-13: {extends: '.test_instance'}
220+
oraclelinux-8-3006-13: {extends: '.test_instance'}
221+
rockylinux-9-3006-13: {extends: '.test_instance'}
222+
rockylinux-8-3006-13: {extends: '.test_instance'}
223+
ubuntu-2404-3006-13: {extends: '.test_instance'}
224+
ubuntu-2204-3006-13: {extends: '.test_instance'}
225+
ubuntu-2004-3006-13: {extends: '.test_instance'}
226226
# yamllint enable rule:line-length
227227

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

‎.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.2
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.59.4
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

‎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)