Skip to content

Commit 2f2d848

Browse files
chore(deps): update dependency https://github.com/dafyddj/copier-ssf-ci to v1.5.0
1 parent 544caa9 commit 2f2d848

File tree

5 files changed

+79
-17
lines changed

5 files changed

+79
-17
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: v1.4.1
2+
_commit: v1.5.0
33
_src_path: https://github.com/dafyddj/copier-ssf-ci
44
failure_permitted_pattern: "(?x)(\n -master$|\n ^fedora-41-|\n ^amazonlinux-2-\n\
55
)"

.github/workflows/main.yml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
---
2+
# yamllint disable rule:comments
3+
name: Test & release
4+
5+
'on':
6+
- pull_request
7+
- push
8+
9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: ${{ github.ref != format('refs/heads/{0}',
12+
github.event.repository.default_branch) }}
13+
14+
jobs:
15+
should-run:
16+
name: Prep / Should run
17+
runs-on: ubuntu-latest
18+
timeout-minutes: 5
19+
outputs:
20+
should-run: ${{ steps.action.outputs.should-run }}
21+
steps:
22+
- id: action
23+
uses:
24+
# yamllint disable-line rule:line-length
25+
techneg-it/should-workflow-run@dcbb88600d59ec2842778ef1e2d41f680f876329 # v1.0.0
26+
pre-commit:
27+
name: Lint / `pre-commit`
28+
needs: should-run
29+
if: fromJSON(needs.should-run.outputs.should-run)
30+
container: techneg/ci-pre-commit:v2.3.3
31+
runs-on: ubuntu-latest
32+
timeout-minutes: 5
33+
steps:
34+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
35+
- name: Export `CI_CACHE_ID` from container
36+
run: echo "CI_CACHE_ID=$(cat /.ci_cache_id)" >> $GITHUB_ENV
37+
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
38+
with:
39+
path: ~/.cache/pre-commit
40+
key: "${{ env.CI_CACHE_ID }}|\
41+
${{ hashFiles('.pre-commit-config.yaml') }}"
42+
- name: Run `pre-commit`
43+
run: |
44+
git config --global --add safe.directory $(pwd)
45+
pre-commit run --all-files --color always --verbose
46+
pre-commit run --color always --hook-stage manual commitlint-ci
47+
results:
48+
name: Release / Collect results
49+
permissions:
50+
checks: read
51+
runs-on: ubuntu-latest
52+
timeout-minutes: 15
53+
steps:
54+
# yamllint disable-line rule:line-length
55+
- uses: poseidon/wait-for-status-checks@899c768d191b56eef585c18f8558da19e1f3e707 # v0.6.0
56+
with:
57+
ignore: Release / Collect results
58+
ignore_pattern: ^GitLab CI
59+
token: ${{ secrets.GITHUB_TOKEN }}
60+
- run: echo "::notice ::Workflow success!"

.gitlab-ci.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
stage_test: &stage_test 'test'
1515
# `image`
1616
# yamllint disable rule:line-length
17-
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.89@sha256:6d51c9542819b94f0596e3568794d17e3dc742949ae438ea56c95091766d39be'
18-
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.58@sha256:914a6bd7b98efabd844f57d0d2539e8864162a73da581409a3e7fec41e0a4c5f'
19-
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.58@sha256:914a6bd7b98efabd844f57d0d2539e8864162a73da581409a3e7fec41e0a4c5f'
20-
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.23@sha256:53d89d685532acbc29b7be6a56143ec5e11a8a19d5a76969dc4f8c0a35a53425'
17+
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.90@sha256:8334132f86e7241ed7eb5ac6469aa1a44c68f2b0923349209e7a7f403de18c97'
18+
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.59@sha256:df2308e9c162f73c2094a913dcd29baccb07e3fd677418a74437e7780a7bcd1b'
19+
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.59@sha256:df2308e9c162f73c2094a913dcd29baccb07e3fd677418a74437e7780a7bcd1b'
20+
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.24@sha256:0508ba9bb36bbfe9c12da5745cfb85159cdfbf8453c64fb63c9ca4d6e6cca679'
2121
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:fe69f9642c7edde46bbd78326d2c42c6e13fc73694efb142e92e206725479328'
2222
image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14@sha256:374f588420087517a3cc0235e11293bffd72d7a59da3d98d5e69f014ff2a7761'
2323
# `services`
2424
services_docker_dind: &services_docker_dind
25-
- 'docker:28.1.1-dind@sha256:eceba5b0fc2fcf83a74c298391c2ed9e1adbdaf04ee173611bd6282ec973e7ba'
25+
- 'docker:28.2.2-dind@sha256:bbc590727c1e4fe707877314ff4f0f977bdda2985c485f2b044db0e18979efb3'
2626
# yamllint enable rule:line-length
2727
# `variables`
2828
# https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3
@@ -86,6 +86,7 @@ pre-commit:
8686
- '${PRE_COMMIT_HOME}'
8787
script:
8888
- 'pre-commit run --all-files --color always --verbose'
89+
- 'pre-commit run --color always --hook-stage manual commitlint-ci'
8990

9091
# Use a separate job for `rubocop` other than the one potentially run by `pre-commit`
9192
# - The `pre-commit` check will only be available for formulas that pass the default

.pre-commit-config.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,13 @@ ci:
1717
submodules: false
1818
default_stages: [pre-commit]
1919
repos:
20-
- repo: https://github.com/dafyddj/commitlint-pre-commit-hook
21-
rev: v2.3.0
20+
- repo: https://github.com/dafyddj/mirrors-commitlint
21+
rev: v19.8.1
2222
hooks:
2323
- id: commitlint
24-
name: Check commit message using commitlint
25-
description: Lint commit message against @commitlint/config-conventional rules
26-
stages: [commit-msg]
27-
additional_dependencies: ['@commitlint/[email protected]']
24+
- id: commitlint-ci
2825
- repo: https://github.com/rubocop-hq/rubocop
29-
rev: v1.75.7
26+
rev: v1.75.8
3027
hooks:
3128
- id: rubocop
3229
name: Check Ruby files with rubocop
@@ -76,7 +73,7 @@ repos:
7673
name: Check Salt files using salt-lint
7774
files: ^.*\.(sls|jinja|j2|tmpl|tst)$
7875
- repo: https://github.com/rstcheck/rstcheck
79-
rev: v6.2.4
76+
rev: v6.2.5
8077
hooks:
8178
- id: rstcheck
8279
name: Check reST files using rstcheck
@@ -96,13 +93,16 @@ repos:
9693
)$
9794
additional_dependencies: [pygments==2.16.1]
9895
- repo: https://github.com/renovatebot/pre-commit-hooks
99-
rev: 40.32.7
96+
rev: 40.36.8
10097
hooks:
10198
- id: renovate-config-validator
10299
name: Check Renovate config with renovate-config-validator
103100
- repo: https://github.com/python-jsonschema/check-jsonschema
104101
rev: 0.33.0
105102
hooks:
103+
- id: check-github-workflows
104+
name: Check GitHub workflows with check-jsonschema
105+
args: [--verbose]
106106
- id: check-gitlab-ci
107107
name: Check GitLab CI config with check-jsonschema
108-
args: ["--verbose"]
108+
args: [--verbose]

commitlint.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ module.exports = {
66
'header-max-length': [2, 'always', 72],
77
},
88
ignores: [
9-
(commit) => commit.startsWith("chore(deps):")
9+
(commit) => commit.startsWith("chore(deps):"),
10+
(commit) => commit.startsWith("[CI merge]")
1011
],
1112
};

0 commit comments

Comments
 (0)