Merge pull request #171 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.11.3

Author: jeff350

.copier-answers.ssf-ci.yml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: v2.11.2
+_commit: v2.11.3
 _src_path: https://github.com/dafyddj/copier-ssf-ci
 failure_permitted_ignored: []
 failure_permitted_patterns: []

.github/workflows/main.yml

@@ -25,20 +25,20 @@ jobs:
     name: Lint / `pre-commit`
     needs: should-run
     if: fromJSON(needs.should-run.outputs.should-run)
-    container: techneg/ci-pre-commit:v2.5.47@sha256:d73cd0b63eb950a8b8bac3e5a20ec06c4224597681d921dd7ce803fbf5924465
+    container: techneg/ci-pre-commit:v2.5.48@sha256:7a263ee75dcaee23c52452bba7c8598caf2ec3a37f62a89cc9073961abf258cc
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
       - run: | # Needed because of bug #2031 in `actions/checkout`
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           fetch-depth: 0
           fetch-tags: true
           filter: tree:0
       - name: Export `CI_CACHE_ID` from container
         run: echo "CI_CACHE_ID=$(cat /.ci_cache_id)" >> $GITHUB_ENV
-      - uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+      - uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: ~/.cache/pre-commit
           key: "${{ env.CI_CACHE_ID }}|\
@@ -61,13 +61,13 @@ jobs:
       issues: write
       pull-requests: write
       checks: read
-    container: techneg/ci-semantic-release:v1.2.45@sha256:39e80afd903fd70dbeb8c9dc455a58acdf97e39d0283c15af126ecc34facfcfc
+    container: techneg/ci-semantic-release:v1.2.46@sha256:ca3c9c8f0a5b0965789d9472adfe456ceec789adeec2f2122ee1c267e532c787
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
       - run: |  # Needed due to bug actions/checkout#2031
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       # yamllint disable-line rule:line-length
       - uses: poseidon/wait-for-status-checks@899c768d191b56eef585c18f8558da19e1f3e707 # v0.6.0
         with:

.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.144@sha256:17a84d5fe3f9debb55efa93387d0286d0c9ca4451efa8a08d58e417db0b12805'
-  image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.114@sha256:9eb3c93cd2c495b64c9f9776a9053d529a07460506b0b684ef3ca8220632e034'
-  image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.114@sha256:9eb3c93cd2c495b64c9f9776a9053d529a07460506b0b684ef3ca8220632e034'
-  image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.5.47@sha256:d73cd0b63eb950a8b8bac3e5a20ec06c4224597681d921dd7ce803fbf5924465'
+  image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.145@sha256:aee27ba527e1e3121a500f6c205a6ee4681deb276a10b277c7a5f78d42732776'
+  image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.115@sha256:2d00fbc875ad5022fc6fe7d8f4806b327171de16516f11d92c1342756b0908a0'
+  image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.115@sha256:2d00fbc875ad5022fc6fe7d8f4806b327171de16516f11d92c1342756b0908a0'
+  image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.5.48@sha256:7a263ee75dcaee23c52452bba7c8598caf2ec3a37f62a89cc9073961abf258cc'
   image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:a2abed57112d1931b77b30138d8f6a211303f10f2d03d42513cfbe7de1e25963'
-  image_semantic-release: &image_semanticrelease 'techneg/ci-semantic-release:v1.2.45@sha256:39e80afd903fd70dbeb8c9dc455a58acdf97e39d0283c15af126ecc34facfcfc'
+  image_semantic-release: &image_semanticrelease 'techneg/ci-semantic-release:v1.2.46@sha256:ca3c9c8f0a5b0965789d9472adfe456ceec789adeec2f2122ee1c267e532c787'
   # `services`
   services_docker_dind: &services_docker_dind
-    - 'docker:29.5.3-dind@sha256:7278248384185bcbb54c7a76b2f0a7d354c4aac920605cc1ab48968d961052fb'
+    - 'docker:29.6.1-dind@sha256:66d292e5c26bd33a6f6f61cacb880de2186339a524ecba1ce098dbbaceed6515'
   # yamllint enable rule:line-length
   # `variables`
   # https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3
@@ -86,6 +86,10 @@ build-cache:
 commitlint:
   extends: '.lint_job'
   image: *image_commitlint
+  rules:
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+      when: never
+    - when: on_success
   script:
     # Add `upstream` remote to get access to `upstream/master`
     - 'git remote add upstream

.pre-commit-config.yaml

@@ -100,12 +100,12 @@ repos:
             )$
         additional_dependencies: [pygments==2.16.1]
   - repo: https://github.com/renovatebot/pre-commit-hooks
-    rev: 43.227.0
+    rev: 43.249.0
     hooks:
       - id: renovate-config-validator
         name: Check Renovate config with renovate-config-validator
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.37.3
+    rev: 0.37.4
     hooks:
       - id: check-github-workflows
         name: Check GitHub workflows with check-jsonschema

Gemfile

@@ -2,7 +2,7 @@
 
 # This is a placeholder version to remind us to update the Gemfile
 # when a new stable Chef Workstation is released
-# renovate: chef-workstation 25.13.7
+# renovate: chef-workstation 25.14.2
 
 source ENV.fetch('PROXY_RUBYGEMSORG', 'https://rubygems.org')
 
@@ -12,16 +12,16 @@ source ENV.fetch('PROXY_RUBYGEMSORG', 'https://rubygems.org')
 gem 'inspec', git: 'https://gitlab.com/saltstack-formulas/infrastructure/inspec', branch: 'ssf'
 # rubocop:enable Layout/LineLength
 
-# Install the `kitchen-docker` gem using `git` in order to gain a performance
-# improvement: avoid package installations which are already covered by the
-# `salt-image-builder` (i.e. the pre-salted images that we're using)
+# Install the `kitchen-docker` gem using `git` in order to avoid an upstream
+# error caused by `kitchen-docker.gemspec`.
+# TODO: correct the error upstream
 # rubocop:disable Layout/LineLength
-gem 'kitchen-docker', git: 'https://github.com/test-kitchen/kitchen-docker', ref: '511e4ad36856b9e2eccceb56603586e6cebd296a'
+gem 'kitchen-docker', git: 'https://github.com/dafyddj/kitchen-docker', branch: 'chore/gemspec'
 # rubocop:enable Layout/LineLength
 
 gem 'kitchen-inspec', '3.1.0'
 gem 'kitchen-salt', '0.7.2'
 
-gem 'net-ssh', '7.3.0'
+gem 'net-ssh', '7.3.2'
 
-gem 'test-kitchen', '3.9.1'
+gem 'test-kitchen', '4.0.0'