Skip to content

Commit ea2a85c

Browse files
chore(copier): update template https://github.com/dafyddj/copier-ssf-ci to v2.8.0
1 parent 5a0a503 commit ea2a85c

File tree

6 files changed

+131
-140
lines changed

6 files changed

+131
-140
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.7.0
2+
_commit: v2.8.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: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,31 @@ 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.32@sha256:fa9eef397583add95f4fccefa6ecbbf7a3845d6168f07393da7bc619696b246b
28+
container: techneg/ci-pre-commit:v2.5.5@sha256:9d92b83a64378da3f9363668b0da244d9f12039d86579881d649ddb40ce261f3
2929
runs-on: ubuntu-latest
30-
timeout-minutes: 5
30+
timeout-minutes: 10
3131
steps:
3232
- run: | # Needed because of bug #2031 in `actions/checkout`
3333
git config --global --add safe.directory "$GITHUB_WORKSPACE"
34-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
34+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3535
with:
3636
fetch-depth: 0
3737
fetch-tags: true
3838
filter: tree:0
3939
- name: Export `CI_CACHE_ID` from container
4040
run: echo "CI_CACHE_ID=$(cat /.ci_cache_id)" >> $GITHUB_ENV
41-
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
41+
- uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
4242
with:
4343
path: ~/.cache/pre-commit
4444
key: "${{ env.CI_CACHE_ID }}|\
4545
${{ hashFiles('.pre-commit-config.yaml') }}"
4646
restore-keys: |
4747
${{ env.CI_CACHE_ID }}|
4848
- name: Build cache
49-
shell: bash
5049
run: |
5150
pre-commit gc
52-
echo "Installing hook environments"
53-
time pre-commit install-hooks
51+
echo "Installing hook environments..."
52+
time -f "Hook installation took %E" pre-commit install-hooks
5453
- name: Run `pre-commit`
5554
run: |
5655
pre-commit run --all-files --color always --verbose
@@ -62,13 +61,13 @@ jobs:
6261
issues: write
6362
pull-requests: write
6463
checks: read
65-
container: techneg/ci-semantic-release:v1.1.0
64+
container: techneg/ci-semantic-release:v1.2.4@sha256:e7cfe36054a56382568c0824d2539a67a956711d7b674093db320815e928ee27
6665
runs-on: ubuntu-latest
6766
timeout-minutes: 15
6867
steps:
6968
- run: | # Needed due to bug actions/checkout#2031
7069
git config --global --add safe.directory "$GITHUB_WORKSPACE"
71-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
70+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
7271
# yamllint disable-line rule:line-length
7372
- uses: poseidon/wait-for-status-checks@899c768d191b56eef585c18f8558da19e1f3e707 # v0.6.0
7473
with:

.gitlab-ci.yml

Lines changed: 42 additions & 51 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.98@sha256:f227ba6da3c684b5506fa338bdb82b17e7a7a3f75f56b2407632b43a7e7276a2'
19-
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.67@sha256:2887fb02ee694a97241777b043b1942b7e6803080e06dd18633f083eed463844'
20-
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.67@sha256:2887fb02ee694a97241777b043b1942b7e6803080e06dd18633f083eed463844'
21-
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.32@sha256:fa9eef397583add95f4fccefa6ecbbf7a3845d6168f07393da7bc619696b246b'
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 'techneg/ci-semantic-release:v1.1.0'
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.3.2-dind@sha256:44383404ebf0c36243f5969f0dddd23c204ea3bb185e7473a4141f6ccfd07b53'
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,42 +175,42 @@ 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-6: {extends: '.test_instance'}
188-
almalinux-8-3007-6: {extends: '.test_instance'}
189-
amazonlinux-2023-3007-6: {extends: '.test_instance'}
190-
amazonlinux-2-3007-6: {extends: '.test_instance_failure_permitted'}
191-
centos-stream9-3007-6: {extends: '.test_instance'}
192-
debian-12-3007-6: {extends: '.test_instance'}
193-
debian-11-3007-6: {extends: '.test_instance'}
194-
fedora-41-3007-6: {extends: '.test_instance_failure_permitted'}
195-
fedora-40-3007-6: {extends: '.test_instance'}
196-
opensuse-leap-156-3007-6: {extends: '.test_instance'}
197-
opensuse-tmbl-latest-3007-6: {extends: '.test_instance'}
198-
oraclelinux-9-3007-6: {extends: '.test_instance'}
199-
oraclelinux-8-3007-6: {extends: '.test_instance'}
200-
rockylinux-9-3007-6: {extends: '.test_instance'}
201-
rockylinux-8-3007-6: {extends: '.test_instance'}
202-
ubuntu-2404-3007-6: {extends: '.test_instance'}
203-
ubuntu-2204-3007-6: {extends: '.test_instance'}
204-
ubuntu-2004-3007-6: {extends: '.test_instance'}
205-
almalinux-9-3006-14: {extends: '.test_instance'}
206-
almalinux-8-3006-14: {extends: '.test_instance'}
207-
amazonlinux-2023-3006-14: {extends: '.test_instance'}
208-
amazonlinux-2-3006-14: {extends: '.test_instance_failure_permitted'}
209-
centos-stream9-3006-14: {extends: '.test_instance'}
210-
debian-12-3006-14: {extends: '.test_instance'}
211-
debian-11-3006-14: {extends: '.test_instance'}
212-
fedora-41-3006-14: {extends: '.test_instance_failure_permitted'}
213-
fedora-40-3006-14: {extends: '.test_instance'}
214-
opensuse-leap-156-3006-14: {extends: '.test_instance'}
215-
opensuse-tmbl-latest-3006-14: {extends: '.test_instance'}
216-
oraclelinux-9-3006-14: {extends: '.test_instance'}
217-
oraclelinux-8-3006-14: {extends: '.test_instance'}
218-
rockylinux-9-3006-14: {extends: '.test_instance'}
219-
rockylinux-8-3006-14: {extends: '.test_instance'}
220-
ubuntu-2404-3006-14: {extends: '.test_instance'}
221-
ubuntu-2204-3006-14: {extends: '.test_instance'}
222-
ubuntu-2004-3006-14: {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
###############################################################################

.pre-commit-config.yaml

Lines changed: 4 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.79.0
33+
rev: v1.80.1
3434
hooks:
3535
- id: rubocop
3636
name: Check Ruby files with rubocop
@@ -100,12 +100,12 @@ repos:
100100
)$
101101
additional_dependencies: [pygments==2.16.1]
102102
- repo: https://github.com/renovatebot/pre-commit-hooks
103-
rev: 41.43.0
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.2
108+
rev: 0.33.3
109109
hooks:
110110
- id: check-github-workflows
111111
name: Check GitHub workflows with check-jsonschema

0 commit comments

Comments
 (0)