Merge pull request #87 from saltstack-formulas/renovate/https-github.com-dafyddj-copier-ssf-ci-2.x

chore(copier): update template https://github.com/dafyddj/copier-ssf-ci to v2.2.1

Author: dafyddj

.copier-answers.ssf-ci.yml

@@ -1,9 +1,10 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: v2.1.0
+_commit: v2.2.1
 _src_path: https://github.com/dafyddj/copier-ssf-ci
 failure_permitted_ignored: []
 failure_permitted_patterns: []
 formula_name: vault
+release_using_gha: true
 renovate_extend_presets:
 - github>saltstack-formulas/.github
 - github>saltstack-formulas/.github:copier

.github/workflows/main.yml

@@ -1,5 +1,4 @@
 ---
-# yamllint disable rule:comments
 name: Test & release
 
 'on':
@@ -20,15 +19,13 @@ jobs:
       should-run: ${{ steps.action.outputs.should-run }}
     steps:
       - id: action
-        uses:
-          # yamllint disable-line rule:line-length
-          techneg-it/should-workflow-run@dcbb88600d59ec2842778ef1e2d41f680f876329 # v1.0.0
+        # yamllint disable-line rule:line-length
+        uses: techneg-it/should-workflow-run@eff19348eb884f57e05bc6f05ae48ece3af14714 # v1.0.1
   pre-commit:
     name: Lint / `pre-commit`
     needs: should-run
     if: fromJSON(needs.should-run.outputs.should-run)
-    # yamllint disable-line rule:line-length
-    container: techneg/ci-pre-commit:v2.4.25@sha256:ff5192e893c1079fbf70e3ce6bfc3773815041786a75659793158be930ba7803
+    container: techneg/ci-pre-commit:v2.4.26@sha256:60f5e15b35fd93a16bff63a6af078f2e61ca06baf1db18a7b30ebaf121f309ba
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
@@ -49,6 +46,46 @@ jobs:
           git config --global --add safe.directory $(pwd)
           pre-commit run --all-files --color always --verbose
           pre-commit run --color always --hook-stage manual commitlint-ci
+  test:
+    name: Test / Kitchen
+    needs:
+      - pre-commit
+      - should-run
+    if: fromJSON(needs.should-run.outputs.should-run)
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - debian-12-master
+          - debian-11-master
+          - ubuntu-2404-master
+          - ubuntu-2204-master
+          - ubuntu-2004-master
+          - debian-12-3007-4
+          - debian-11-3007-4
+          - ubuntu-2404-3007-4
+          - ubuntu-2204-3007-4
+          - ubuntu-2004-3007-4
+          - debian-12-3006-12
+          - debian-11-3006-12
+          - ubuntu-2404-3006-12
+          - ubuntu-2204-3006-12
+          - ubuntu-2004-3006-12
+    steps:
+      - name: Debug on runner (When re-run with "Enable debug logging" checked)
+        if: runner.debug
+        uses: mxschmitt/action-tmate@7b6a61a73bbb9793cb80ad69b8dd8ac19261834c # v3.22
+        with:
+          detached: true
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
+        with:
+          bundler-cache: true
+          ruby-version: '3.1'
+      - run: |
+          bin/kitchen verify ${{ matrix.platform }}
   results:
     name: Release / Collect results
     permissions:
@@ -59,7 +96,13 @@ jobs:
       # yamllint disable-line rule:line-length
       - uses: poseidon/wait-for-status-checks@899c768d191b56eef585c18f8558da19e1f3e707 # v0.6.0
         with:
-          ignore: Release / Collect results
+          ignore: >
+            Release / Collect results,
+            Test / Kitchen (debian-12-master),
+            Test / Kitchen (debian-11-master),
+            Test / Kitchen (ubuntu-2404-master),
+            Test / Kitchen (ubuntu-2204-master),
+            Test / Kitchen (ubuntu-2004-master)
           ignore_pattern: ^GitLab CI
           token: ${{ secrets.GITHUB_TOKEN }}
       - run: echo "::notice ::Workflow success!"

.gitlab-ci.yml

@@ -15,15 +15,15 @@
   stage_test: &stage_test 'test'
   # `image`
   # yamllint disable rule:line-length
-  image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.91@sha256:02574d0409adafb76d5a40a7d08202073e5377f4a7c4bfe9e198d1203ff94a8c'
-  image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.60@sha256:de98b8d1d3cf86639fe69bfc4f0416115d18300759c5ed2948ac56f973dd944f'
-  image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.60@sha256:de98b8d1d3cf86639fe69bfc4f0416115d18300759c5ed2948ac56f973dd944f'
-  image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.25@sha256:ff5192e893c1079fbf70e3ce6bfc3773815041786a75659793158be930ba7803'
+  image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.92@sha256:ba54dd413413f05cb3520a1cc160a7f61cc3ec8242914ae3673d3dfa409f0b94'
+  image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.61@sha256:9fa0e0b1c0364a9be92e1f80d3817bc794ed2fe4dc93c8850bab03cd170cbea0'
+  image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.61@sha256:9fa0e0b1c0364a9be92e1f80d3817bc794ed2fe4dc93c8850bab03cd170cbea0'
+  image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.26@sha256:60f5e15b35fd93a16bff63a6af078f2e61ca06baf1db18a7b30ebaf121f309ba'
   image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:fe69f9642c7edde46bbd78326d2c42c6e13fc73694efb142e92e206725479328'
   image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14@sha256:374f588420087517a3cc0235e11293bffd72d7a59da3d98d5e69f014ff2a7761'
   # `services`
   services_docker_dind: &services_docker_dind
-    - 'docker:28.2.2-dind@sha256:d4668861cabc1691635d98e827a81cfa834a416f8fe0f4efc609f9f806d86d82'
+    - 'docker:28.2.2-dind@sha256:ff052514f359111edd920b54581e7aca65629458607f9fbdbf82d7eefbe0602b'
   # yamllint enable rule:line-length
   # `variables`
   # https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3

.pre-commit-config.yaml

@@ -30,7 +30,7 @@ repos:
       - id: commitlint
       - id: commitlint-ci
   - repo: https://github.com/rubocop-hq/rubocop
-    rev: v1.76.1
+    rev: v1.76.2
     hooks:
       - id: rubocop
         name: Check Ruby files with rubocop
@@ -100,7 +100,7 @@ repos:
             )$
         additional_dependencies: [pygments==2.16.1]
   - repo: https://github.com/renovatebot/pre-commit-hooks
-    rev: 40.48.11
+    rev: 40.59.4
     hooks:
       - id: renovate-config-validator
         name: Check Renovate config with renovate-config-validator

.yamllint

@@ -5,13 +5,16 @@
 extends: 'default'
 
 rules:
+  comments:
+    min-spaces-from-content: 1
   empty-values:
     forbid-in-block-mappings: true
     forbid-in-flow-mappings: true
   line-length:
     # Increase from default of `80`
     # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
     max: 88
+    allow-non-breakable-inline-mappings: true
   octal-values:
     forbid-implicit-octal: true
     forbid-explicit-octal: true