Skip to content

Commit 3852340

Browse files
renovate[bot]renovate[bot]
authored
chore(copier): update template https://github.com/dafyddj/copier-ssf-ci to v2.8.0
1 parent 98f92cb commit 3852340

File tree

11 files changed

+217
-277
lines changed

11 files changed

+217
-277
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.1.0
2+
_commit: v2.8.0
33
_src_path: https://github.com/dafyddj/copier-ssf-ci
44
failure_permitted_ignored: []
55
failure_permitted_patterns: []
66
formula_name: nginx
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: 31 additions & 12 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,46 +19,66 @@ 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-
# yamllint disable-line rule:line-length
31-
container: techneg/ci-pre-commit:v2.4.25@sha256:ff5192e893c1079fbf70e3ce6bfc3773815041786a75659793158be930ba7803
28+
container: techneg/ci-pre-commit:v2.5.5@sha256:9d92b83a64378da3f9363668b0da244d9f12039d86579881d649ddb40ce261f3
3229
runs-on: ubuntu-latest
33-
timeout-minutes: 5
30+
timeout-minutes: 10
3431
steps:
35-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
32+
- run: | # Needed because of bug #2031 in `actions/checkout`
33+
git config --global --add safe.directory "$GITHUB_WORKSPACE"
34+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3635
with:
3736
fetch-depth: 0
3837
fetch-tags: true
3938
filter: tree:0
4039
- name: Export `CI_CACHE_ID` from container
4140
run: echo "CI_CACHE_ID=$(cat /.ci_cache_id)" >> $GITHUB_ENV
42-
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
41+
- uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
4342
with:
4443
path: ~/.cache/pre-commit
4544
key: "${{ env.CI_CACHE_ID }}|\
4645
${{ hashFiles('.pre-commit-config.yaml') }}"
46+
restore-keys: |
47+
${{ env.CI_CACHE_ID }}|
48+
- name: Build cache
49+
run: |
50+
pre-commit gc
51+
echo "Installing hook environments..."
52+
time -f "Hook installation took %E" pre-commit install-hooks
4753
- name: Run `pre-commit`
4854
run: |
49-
git config --global --add safe.directory $(pwd)
5055
pre-commit run --all-files --color always --verbose
51-
pre-commit run --color always --hook-stage manual commitlint-ci
56+
pre-commit run --color always --hook-stage manual --verbose commitlint-ci
5257
results:
5358
name: Release / Collect results
5459
permissions:
60+
contents: write
61+
issues: write
62+
pull-requests: write
5563
checks: read
64+
container: techneg/ci-semantic-release:v1.2.4@sha256:e7cfe36054a56382568c0824d2539a67a956711d7b674093db320815e928ee27
5665
runs-on: ubuntu-latest
5766
timeout-minutes: 15
5867
steps:
68+
- run: | # Needed due to bug actions/checkout#2031
69+
git config --global --add safe.directory "$GITHUB_WORKSPACE"
70+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5971
# yamllint disable-line rule:line-length
6072
- uses: poseidon/wait-for-status-checks@899c768d191b56eef585c18f8558da19e1f3e707 # v0.6.0
6173
with:
62-
ignore: Release / Collect results
74+
ignore: >
75+
Release / Collect results
6376
ignore_pattern: ^GitLab CI
6477
token: ${{ secrets.GITHUB_TOKEN }}
78+
- name: Run `semantic-release`
79+
env:
80+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
81+
MAINTAINER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
82+
run: |
83+
semantic-release --dry-run
6584
- run: echo "::notice ::Workflow success!"

‎.gitlab-ci.yml‎

Lines changed: 42 additions & 54 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.103@sha256:3a2bf514e461769ed7b8880213e9637186bb7e17e0653b4a6ad3f249e4a60d33'
19+
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.72@sha256:20873e73badc9d5ea93e20ef745f64fe957625a755a60c91e3dad600217e2c76'
20+
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.72@sha256:20873e73badc9d5ea93e20ef745f64fe957625a755a60c91e3dad600217e2c76'
21+
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.5.5@sha256:9d92b83a64378da3f9363668b0da244d9f12039d86579881d649ddb40ce261f3'
2222
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:fe69f9642c7edde46bbd78326d2c42c6e13fc73694efb142e92e206725479328'
23-
image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14@sha256:374f588420087517a3cc0235e11293bffd72d7a59da3d98d5e69f014ff2a7761'
23+
image_semantic-release: &image_semanticrelease 'techneg/ci-semantic-release:v1.2.4@sha256:e7cfe36054a56382568c0824d2539a67a956711d7b674093db320815e928ee27'
2424
# `services`
2525
services_docker_dind: &services_docker_dind
26-
- 'docker:28.2.2-dind@sha256:d4668861cabc1691635d98e827a81cfa834a416f8fe0f4efc609f9f806d86d82'
26+
- 'docker:28.3.3-dind@sha256:a56b3bdde89315ed2cc0e4906e582b5033d93bf20d9cb9510c2cdd4e7f7690b1'
2727
# yamllint enable rule:line-length
2828
# `variables`
2929
# https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3
@@ -94,15 +94,6 @@ commitlint:
9494
# Set default commit hashes for `--from` and `--to`
9595
- 'export COMMITLINT_FROM="$(git merge-base upstream/master HEAD)"'
9696
- 'export COMMITLINT_TO="${CI_COMMIT_SHA}"'
97-
# `coqbot` adds a merge commit to test PRs on top of the latest commit in
98-
# the repo; amend this merge commit message to avoid failure
99-
- |
100-
if [ "${GITLAB_USER_LOGIN}" = "coqbot" ] \
101-
&& [ "${CI_COMMIT_BRANCH}" != "master" ]; then
102-
git commit --amend -m \
103-
'chore: reword coqbot merge commit message for commitlint'
104-
export COMMITLINT_TO=HEAD
105-
fi
10697
# Run `commitlint`
10798
- 'commitlint --from "${COMMITLINT_FROM}"
10899
--to "${COMMITLINT_TO}"
@@ -184,55 +175,52 @@ rockylinux-8-master: {extends: '.test_instance_failure_permitted'}
184175
ubuntu-2404-master: {extends: '.test_instance_failure_permitted'}
185176
ubuntu-2204-master: {extends: '.test_instance_failure_permitted'}
186177
ubuntu-2004-master: {extends: '.test_instance_failure_permitted'}
187-
almalinux-9-3007-4: {extends: '.test_instance'}
188-
almalinux-8-3007-4: {extends: '.test_instance'}
189-
amazonlinux-2023-3007-4: {extends: '.test_instance'}
190-
amazonlinux-2-3007-4: {extends: '.test_instance_failure_permitted'}
191-
centos-stream9-3007-4: {extends: '.test_instance'}
192-
debian-12-3007-4: {extends: '.test_instance'}
193-
debian-11-3007-4: {extends: '.test_instance'}
194-
fedora-41-3007-4: {extends: '.test_instance_failure_permitted'}
195-
fedora-40-3007-4: {extends: '.test_instance'}
196-
opensuse-leap-156-3007-4: {extends: '.test_instance'}
197-
opensuse-tmbl-latest-3007-4: {extends: '.test_instance'}
198-
oraclelinux-9-3007-4: {extends: '.test_instance'}
199-
oraclelinux-8-3007-4: {extends: '.test_instance'}
200-
rockylinux-9-3007-4: {extends: '.test_instance'}
201-
rockylinux-8-3007-4: {extends: '.test_instance'}
202-
ubuntu-2404-3007-4: {extends: '.test_instance'}
203-
ubuntu-2204-3007-4: {extends: '.test_instance'}
204-
ubuntu-2004-3007-4: {extends: '.test_instance'}
205-
almalinux-9-3006-12: {extends: '.test_instance'}
206-
almalinux-8-3006-12: {extends: '.test_instance'}
207-
amazonlinux-2023-3006-12: {extends: '.test_instance'}
208-
amazonlinux-2-3006-12: {extends: '.test_instance_failure_permitted'}
209-
centos-stream9-3006-12: {extends: '.test_instance'}
210-
debian-12-3006-12: {extends: '.test_instance'}
211-
debian-11-3006-12: {extends: '.test_instance'}
212-
fedora-41-3006-12: {extends: '.test_instance_failure_permitted'}
213-
fedora-40-3006-12: {extends: '.test_instance'}
214-
opensuse-leap-156-3006-12: {extends: '.test_instance'}
215-
opensuse-tmbl-latest-3006-12: {extends: '.test_instance'}
216-
oraclelinux-9-3006-12: {extends: '.test_instance'}
217-
oraclelinux-8-3006-12: {extends: '.test_instance'}
218-
rockylinux-9-3006-12: {extends: '.test_instance'}
219-
rockylinux-8-3006-12: {extends: '.test_instance'}
220-
ubuntu-2404-3006-12: {extends: '.test_instance'}
221-
ubuntu-2204-3006-12: {extends: '.test_instance'}
222-
ubuntu-2004-3006-12: {extends: '.test_instance'}
178+
almalinux-9-3007-7: {extends: '.test_instance'}
179+
almalinux-8-3007-7: {extends: '.test_instance'}
180+
amazonlinux-2023-3007-7: {extends: '.test_instance'}
181+
amazonlinux-2-3007-7: {extends: '.test_instance_failure_permitted'}
182+
centos-stream9-3007-7: {extends: '.test_instance'}
183+
debian-12-3007-7: {extends: '.test_instance'}
184+
debian-11-3007-7: {extends: '.test_instance'}
185+
fedora-41-3007-7: {extends: '.test_instance_failure_permitted'}
186+
fedora-40-3007-7: {extends: '.test_instance'}
187+
opensuse-leap-156-3007-7: {extends: '.test_instance'}
188+
opensuse-tmbl-latest-3007-7: {extends: '.test_instance'}
189+
oraclelinux-9-3007-7: {extends: '.test_instance'}
190+
oraclelinux-8-3007-7: {extends: '.test_instance'}
191+
rockylinux-9-3007-7: {extends: '.test_instance'}
192+
rockylinux-8-3007-7: {extends: '.test_instance'}
193+
ubuntu-2404-3007-7: {extends: '.test_instance'}
194+
ubuntu-2204-3007-7: {extends: '.test_instance'}
195+
ubuntu-2004-3007-7: {extends: '.test_instance'}
196+
almalinux-9-3006-15: {extends: '.test_instance'}
197+
almalinux-8-3006-15: {extends: '.test_instance'}
198+
amazonlinux-2023-3006-15: {extends: '.test_instance'}
199+
amazonlinux-2-3006-15: {extends: '.test_instance_failure_permitted'}
200+
centos-stream9-3006-15: {extends: '.test_instance'}
201+
debian-12-3006-15: {extends: '.test_instance'}
202+
debian-11-3006-15: {extends: '.test_instance'}
203+
fedora-41-3006-15: {extends: '.test_instance_failure_permitted'}
204+
fedora-40-3006-15: {extends: '.test_instance'}
205+
opensuse-leap-156-3006-15: {extends: '.test_instance'}
206+
opensuse-tmbl-latest-3006-15: {extends: '.test_instance'}
207+
oraclelinux-9-3006-15: {extends: '.test_instance'}
208+
oraclelinux-8-3006-15: {extends: '.test_instance'}
209+
rockylinux-9-3006-15: {extends: '.test_instance'}
210+
rockylinux-8-3006-15: {extends: '.test_instance'}
211+
ubuntu-2404-3006-15: {extends: '.test_instance'}
212+
ubuntu-2204-3006-15: {extends: '.test_instance'}
213+
ubuntu-2004-3006-15: {extends: '.test_instance'}
223214
# yamllint enable rule:line-length
224215

225216
###############################################################################
226217
# `release` stage: `semantic-release`
227218
###############################################################################
228219
semantic-release:
229-
only: *only_branch_master_parent_repo
230220
stage: *stage_release
231221
image: *image_semanticrelease
232222
variables:
233223
MAINTAINER_TOKEN: '${GH_TOKEN}'
234224
script:
235-
# Update `AUTHORS.md`
236-
- '${HOME}/go/bin/maintainer contributor'
237225
# Run `semantic-release`
238226
- 'semantic-release'

‎.pre-commit-config.yaml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ci:
1818
default_stages: [pre-commit]
1919
repos:
2020
- repo: https://github.com/pre-commit/pre-commit-hooks
21-
rev: v5.0.0
21+
rev: v6.0.0
2222
hooks:
2323
- id: check-merge-conflict
2424
name: Check for Git merge conflicts
@@ -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.80.1
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: 41.93.2
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.3
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
@@ -33,13 +33,16 @@ yaml-files:
3333
- test/**/*.sls
3434

3535
rules:
36+
comments:
37+
min-spaces-from-content: 1
3638
empty-values:
3739
forbid-in-block-mappings: true
3840
forbid-in-flow-mappings: true
3941
line-length:
4042
# Increase from default of `80`
4143
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
4244
max: 88
45+
allow-non-breakable-inline-mappings: true
4346
octal-values:
4447
forbid-implicit-octal: true
4548
forbid-explicit-octal: true

‎Gemfile.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -521,10 +521,10 @@ GEM
521521
net-ssh (7.3.0)
522522
net-ssh-gateway (2.0.0)
523523
net-ssh (>= 4.0.0)
524-
nokogiri (1.18.8)
524+
nokogiri (1.18.9)
525525
mini_portile2 (~> 2.8.2)
526526
racc (~> 1.4)
527-
nokogiri (1.18.8-x64-mingw-ucrt)
527+
nokogiri (1.18.9-x64-mingw-ucrt)
528528
racc (~> 1.4)
529529
nori (2.7.0)
530530
bigdecimal
@@ -631,7 +631,7 @@ GEM
631631
winrm (~> 2.0)
632632
winrm-elevated (~> 1.0)
633633
winrm-fs (~> 1.1)
634-
thor (1.3.2)
634+
thor (1.4.0)
635635
timeliness (0.3.10)
636636
tomlrb (1.3.0)
637637
trailblazer-option (0.1.2)

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