Skip to content

Commit 819d5d6

Browse files
chore(copier): update template https://github.com/dafyddj/copier-ssf-ci to v2.2.1
1 parent 6592163 commit 819d5d6

File tree

5 files changed

+17
-15
lines changed

5 files changed

+17
-15
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.2.1
33
_src_path: https://github.com/dafyddj/copier-ssf-ci
44
failure_permitted_ignored: []
55
failure_permitted_patterns: []
66
formula_name: postfix
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: 5 additions & 7 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,15 +19,13 @@ 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.4.26@sha256:60f5e15b35fd93a16bff63a6af078f2e61ca06baf1db18a7b30ebaf121f309ba
3229
runs-on: ubuntu-latest
3330
timeout-minutes: 5
3431
steps:
@@ -59,7 +56,8 @@ jobs:
5956
# yamllint disable-line rule:line-length
6057
- uses: poseidon/wait-for-status-checks@899c768d191b56eef585c18f8558da19e1f3e707 # v0.6.0
6158
with:
62-
ignore: Release / Collect results
59+
ignore: >
60+
Release / Collect results
6361
ignore_pattern: ^GitLab CI
6462
token: ${{ secrets.GITHUB_TOKEN }}
6563
- run: echo "::notice ::Workflow success!"

.gitlab-ci.yml

Lines changed: 5 additions & 5 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.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'
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.2.2-dind@sha256:ff052514f359111edd920b54581e7aca65629458607f9fbdbf82d7eefbe0602b'
2727
# yamllint enable rule:line-length
2828
# `variables`
2929
# https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3

.pre-commit-config.yaml

Lines changed: 2 additions & 2 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.76.2
3434
hooks:
3535
- id: rubocop
3636
name: Check Ruby files with rubocop
@@ -100,7 +100,7 @@ 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.59.4
104104
hooks:
105105
- id: renovate-config-validator
106106
name: Check Renovate config with renovate-config-validator

.yamllint

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
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
@@ -15,6 +17,7 @@ rules:
1517
# Increase from default of `80`
1618
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
1719
max: 88
20+
allow-non-breakable-inline-mappings: true
1821
octal-values:
1922
forbid-implicit-octal: true
2023
forbid-explicit-octal: true

0 commit comments

Comments
 (0)