Skip to content

Commit 7165136

Browse files
dafyddjdafyddj
authored
Merge pull request #38 from dafyddj/ci/copier
chore: apply template `copier-ssf-ci` at v2.5.1
2 parents cb6e3f3 + 93ceb44 commit 7165136

File tree

12 files changed

+381
-205
lines changed

12 files changed

+381
-205
lines changed

‎.copier-answers.ssf-ci.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
2+
_commit: v2.5.1
3+
_src_path: https://github.com/dafyddj/copier-ssf-ci
4+
failure_permitted_ignored: []
5+
failure_permitted_patterns:
6+
- ^amazonlinux-
7+
- ^almalinux-
8+
- ^oraclelinux-
9+
- ^rockylinux-
10+
- ^centos-
11+
formula_name: syslog-ng
12+
release_using_gha: false
13+
renovate_extend_presets:
14+
- github>saltstack-formulas/.github
15+
- github>saltstack-formulas/.github:copier
16+
renovate_ignore_presets: []
17+
supported_oses:
18+
- AlmaLinux OS
19+
- Amazon Linux
20+
- CentOS
21+
- Debian
22+
- Fedora Linux
23+
- openSUSE
24+
- Oracle Linux
25+
- Rocky Linux
26+
- Ubuntu

‎.github/renovate.json5‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
3+
extends: [
4+
"github>saltstack-formulas/.github",
5+
"github>saltstack-formulas/.github:copier"
6+
],
7+
/**********************************************************
8+
* This file is managed as part of a Copier template. *
9+
* Please make your own changes below this comment. *
10+
*********************************************************/
11+
}

‎.github/settings.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
# These settings are synced to GitHub by https://probot.github.io/apps/settings/
3+
4+
repository:
5+
# See https://docs.github.com/en/rest/reference/repos#update-a-repository
6+
# for all available settings
7+
8+
allow_squash_merge: false

‎.github/workflows/main.yml‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
---
2+
name: Test & release
3+
4+
'on':
5+
- pull_request
6+
- push
7+
8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: ${{ github.ref != format('refs/heads/{0}',
11+
github.event.repository.default_branch) }}
12+
13+
jobs:
14+
should-run:
15+
name: Prep / Should run
16+
runs-on: ubuntu-latest
17+
timeout-minutes: 5
18+
outputs:
19+
should-run: ${{ steps.action.outputs.should-run }}
20+
steps:
21+
- id: action
22+
# yamllint disable-line rule:line-length
23+
uses: techneg-it/should-workflow-run@eff19348eb884f57e05bc6f05ae48ece3af14714 # v1.0.1
24+
pre-commit:
25+
name: Lint / `pre-commit`
26+
needs: should-run
27+
if: fromJSON(needs.should-run.outputs.should-run)
28+
container: techneg/ci-pre-commit:v2.4.31@sha256:041f7d716f4cde881e547881e6cc771d499ff424d0afb7ec678176ff0b940d0a
29+
runs-on: ubuntu-latest
30+
timeout-minutes: 5
31+
steps:
32+
- run: | # Needed because of bug #2031 in `actions/checkout`
33+
git config --global --add safe.directory "$GITHUB_WORKSPACE"
34+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
35+
with:
36+
fetch-depth: 0
37+
fetch-tags: true
38+
filter: tree:0
39+
- name: Export `CI_CACHE_ID` from container
40+
run: echo "CI_CACHE_ID=$(cat /.ci_cache_id)" >> $GITHUB_ENV
41+
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
42+
with:
43+
path: ~/.cache/pre-commit
44+
key: "${{ env.CI_CACHE_ID }}|\
45+
${{ 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
54+
- name: Run `pre-commit`
55+
run: |
56+
pre-commit run --all-files --color always --verbose
57+
pre-commit run --color always --hook-stage manual --verbose commitlint-ci
58+
results:
59+
name: Release / Collect results
60+
permissions:
61+
checks: read
62+
runs-on: ubuntu-latest
63+
timeout-minutes: 15
64+
steps:
65+
# yamllint disable-line rule:line-length
66+
- uses: poseidon/wait-for-status-checks@899c768d191b56eef585c18f8558da19e1f3e707 # v0.6.0
67+
with:
68+
ignore: >
69+
Release / Collect results
70+
ignore_pattern: ^GitLab CI
71+
token: ${{ secrets.GITHUB_TOKEN }}
72+
- run: echo "::notice ::Workflow success!"

‎.gitlab-ci.yml‎

Lines changed: 64 additions & 24 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.97@sha256:7eaa2170f49cf9a8f2acd11a9fc35d4ec93c514935c6b76f7df8a39f9d2afb45'
19+
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.66@sha256:5a915fcebd0c32f54b4effcf1aa58ce03f78fc8e8b95e706183ec57c24c9337c'
20+
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.66@sha256:5a915fcebd0c32f54b4effcf1aa58ce03f78fc8e8b95e706183ec57c24c9337c'
21+
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.31@sha256:041f7d716f4cde881e547881e6cc771d499ff424d0afb7ec678176ff0b940d0a'
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.3.2-dind@sha256:5415fccf3da3aed821efb2258cb7dcf52fb9bb0627b02d45338e887c352c4bce'
2727
# yamllint enable rule:line-length
2828
# `variables`
2929
# https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3
@@ -161,25 +161,65 @@ rubocop:
161161
# Make sure the instances listed below match up with
162162
# the `platforms` defined in `kitchen.yml`
163163
# yamllint disable rule:line-length
164-
default-debian-12-master: {extends: '.test_instance_failure_permitted'}
165-
default-debian-11-master: {extends: '.test_instance_failure_permitted'}
166-
default-ubuntu-2404-master: {extends: '.test_instance_failure_permitted'}
167-
default-ubuntu-2204-master: {extends: '.test_instance_failure_permitted'}
168-
default-opensuse-leap-156-master: {extends: '.test_instance_failure_permitted'}
169-
default-fedora-40-master: {extends: '.test_instance_failure_permitted'}
170-
default-debian-12-3007-4: {extends: '.test_instance'}
171-
default-debian-11-3007-4: {extends: '.test_instance'}
172-
default-ubuntu-2404-3007-4: {extends: '.test_instance'}
173-
default-ubuntu-2204-3007-4: {extends: '.test_instance'}
174-
default-opensuse-leap-156-3007-4: {extends: '.test_instance'}
175-
default-fedora-40-3007-4: {extends: '.test_instance'}
176-
default-debian-12-3006-12: {extends: '.test_instance'}
177-
default-debian-11-3006-12: {extends: '.test_instance'}
178-
default-ubuntu-2404-3006-12: {extends: '.test_instance'}
179-
default-ubuntu-2204-3006-12: {extends: '.test_instance'}
180-
default-opensuse-leap-156-3006-12: {extends: '.test_instance'}
181-
default-fedora-40-3006-12: {extends: '.test_instance'}
182-
164+
# Fedora 41+ will permit failure until this PR is merged into kitchen-docker
165+
# https://github.com/test-kitchen/kitchen-docker/pull/427 is merged
166+
# OpenSUSE master branch will fail until zypperpkg module is back in salt core
167+
# https://github.com/saltstack/great-module-migration/issues/14
168+
#
169+
almalinux-9-master: {extends: '.test_instance_failure_permitted'}
170+
almalinux-8-master: {extends: '.test_instance_failure_permitted'}
171+
amazonlinux-2023-master: {extends: '.test_instance_failure_permitted'}
172+
amazonlinux-2-master: {extends: '.test_instance_failure_permitted'}
173+
centos-stream9-master: {extends: '.test_instance_failure_permitted'}
174+
debian-12-master: {extends: '.test_instance_failure_permitted'}
175+
debian-11-master: {extends: '.test_instance_failure_permitted'}
176+
fedora-41-master: {extends: '.test_instance_failure_permitted'}
177+
fedora-40-master: {extends: '.test_instance_failure_permitted'}
178+
opensuse-leap-156-master: {extends: '.test_instance_failure_permitted'}
179+
opensuse-tmbl-latest-master: {extends: '.test_instance_failure_permitted'}
180+
oraclelinux-9-master: {extends: '.test_instance_failure_permitted'}
181+
oraclelinux-8-master: {extends: '.test_instance_failure_permitted'}
182+
rockylinux-9-master: {extends: '.test_instance_failure_permitted'}
183+
rockylinux-8-master: {extends: '.test_instance_failure_permitted'}
184+
ubuntu-2404-master: {extends: '.test_instance_failure_permitted'}
185+
ubuntu-2204-master: {extends: '.test_instance_failure_permitted'}
186+
ubuntu-2004-master: {extends: '.test_instance_failure_permitted'}
187+
almalinux-9-3007-6: {extends: '.test_instance_failure_permitted'}
188+
almalinux-8-3007-6: {extends: '.test_instance_failure_permitted'}
189+
amazonlinux-2023-3007-6: {extends: '.test_instance_failure_permitted'}
190+
amazonlinux-2-3007-6: {extends: '.test_instance_failure_permitted'}
191+
centos-stream9-3007-6: {extends: '.test_instance_failure_permitted'}
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_failure_permitted'}
199+
oraclelinux-8-3007-6: {extends: '.test_instance_failure_permitted'}
200+
rockylinux-9-3007-6: {extends: '.test_instance_failure_permitted'}
201+
rockylinux-8-3007-6: {extends: '.test_instance_failure_permitted'}
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_failure_permitted'}
206+
almalinux-8-3006-14: {extends: '.test_instance_failure_permitted'}
207+
amazonlinux-2023-3006-14: {extends: '.test_instance_failure_permitted'}
208+
amazonlinux-2-3006-14: {extends: '.test_instance_failure_permitted'}
209+
centos-stream9-3006-14: {extends: '.test_instance_failure_permitted'}
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_failure_permitted'}
217+
oraclelinux-8-3006-14: {extends: '.test_instance_failure_permitted'}
218+
rockylinux-9-3006-14: {extends: '.test_instance_failure_permitted'}
219+
rockylinux-8-3006-14: {extends: '.test_instance_failure_permitted'}
220+
ubuntu-2404-3006-14: {extends: '.test_instance'}
221+
ubuntu-2204-3006-14: {extends: '.test_instance'}
222+
ubuntu-2004-3006-14: {extends: '.test_instance'}
183223
# yamllint enable rule:line-length
184224

185225
###############################################################################

‎.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.1
33+
rev: v1.78.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.48.11
103+
rev: 41.42.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.2
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
@@ -5,13 +5,16 @@
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
1113
line-length:
1214
# Increase from default of `80`
1315
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
1416
max: 88
17+
allow-non-breakable-inline-mappings: true
1518
octal-values:
1619
forbid-implicit-octal: true
1720
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 & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +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-
};
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)