diff --git a/.copier-answers.ssf-ci.yml b/.copier-answers.ssf-ci.yml index 4e24dbf..c6685b0 100644 --- a/.copier-answers.ssf-ci.yml +++ b/.copier-answers.ssf-ci.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY -_commit: v2.7.0 +_commit: v2.8.0 _src_path: https://github.com/dafyddj/copier-ssf-ci failure_permitted_ignored: [] failure_permitted_patterns: [] diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 24ce222..f9e552a 100644 --- a/.github/workflows/main.yml +++ b/.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.4.32@sha256:fa9eef397583add95f4fccefa6ecbbf7a3845d6168f07393da7bc619696b246b + container: techneg/ci-pre-commit:v2.5.5@sha256:9d92b83a64378da3f9363668b0da244d9f12039d86579881d649ddb40ce261f3 runs-on: ubuntu-latest - timeout-minutes: 5 + timeout-minutes: 10 steps: - run: | # Needed because of bug #2031 in `actions/checkout` git config --global --add safe.directory "$GITHUB_WORKSPACE" - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.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@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3 + - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4 with: path: ~/.cache/pre-commit key: "${{ env.CI_CACHE_ID }}|\ @@ -46,11 +46,10 @@ jobs: restore-keys: | ${{ env.CI_CACHE_ID }}| - name: Build cache - shell: bash run: | pre-commit gc - echo "Installing hook environments" - time pre-commit install-hooks + echo "Installing hook environments..." + time -f "Hook installation took %E" pre-commit install-hooks - name: Run `pre-commit` run: | pre-commit run --all-files --color always --verbose @@ -62,13 +61,13 @@ jobs: issues: write pull-requests: write checks: read - container: techneg/ci-semantic-release:v1.1.0 + container: techneg/ci-semantic-release:v1.2.4@sha256:e7cfe36054a56382568c0824d2539a67a956711d7b674093db320815e928ee27 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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 # yamllint disable-line rule:line-length - uses: poseidon/wait-for-status-checks@899c768d191b56eef585c18f8558da19e1f3e707 # v0.6.0 with: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ac6c7ac..f59daa5 100644 --- a/.gitlab-ci.yml +++ b/.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.98@sha256:f227ba6da3c684b5506fa338bdb82b17e7a7a3f75f56b2407632b43a7e7276a2' - image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.67@sha256:2887fb02ee694a97241777b043b1942b7e6803080e06dd18633f083eed463844' - image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.67@sha256:2887fb02ee694a97241777b043b1942b7e6803080e06dd18633f083eed463844' - image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.32@sha256:fa9eef397583add95f4fccefa6ecbbf7a3845d6168f07393da7bc619696b246b' + image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.103@sha256:3a2bf514e461769ed7b8880213e9637186bb7e17e0653b4a6ad3f249e4a60d33' + image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.72@sha256:20873e73badc9d5ea93e20ef745f64fe957625a755a60c91e3dad600217e2c76' + image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.72@sha256:20873e73badc9d5ea93e20ef745f64fe957625a755a60c91e3dad600217e2c76' + image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.5.5@sha256:9d92b83a64378da3f9363668b0da244d9f12039d86579881d649ddb40ce261f3' image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:fe69f9642c7edde46bbd78326d2c42c6e13fc73694efb142e92e206725479328' - image_semantic-release: &image_semanticrelease 'techneg/ci-semantic-release:v1.1.0' + image_semantic-release: &image_semanticrelease 'techneg/ci-semantic-release:v1.2.4@sha256:e7cfe36054a56382568c0824d2539a67a956711d7b674093db320815e928ee27' # `services` services_docker_dind: &services_docker_dind - - 'docker:28.3.2-dind@sha256:44383404ebf0c36243f5969f0dddd23c204ea3bb185e7473a4141f6ccfd07b53' + - 'docker:28.3.3-dind@sha256:a56b3bdde89315ed2cc0e4906e582b5033d93bf20d9cb9510c2cdd4e7f7690b1' # yamllint enable rule:line-length # `variables` # https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3 @@ -94,15 +94,6 @@ commitlint: # Set default commit hashes for `--from` and `--to` - 'export COMMITLINT_FROM="$(git merge-base upstream/master HEAD)"' - 'export COMMITLINT_TO="${CI_COMMIT_SHA}"' - # `coqbot` adds a merge commit to test PRs on top of the latest commit in - # the repo; amend this merge commit message to avoid failure - - | - if [ "${GITLAB_USER_LOGIN}" = "coqbot" ] \ - && [ "${CI_COMMIT_BRANCH}" != "master" ]; then - git commit --amend -m \ - 'chore: reword coqbot merge commit message for commitlint' - export COMMITLINT_TO=HEAD - fi # Run `commitlint` - 'commitlint --from "${COMMITLINT_FROM}" --to "${COMMITLINT_TO}" @@ -187,42 +178,42 @@ rockylinux-8-master: {extends: '.test_instance_failure_permitted'} ubuntu-2404-master: {extends: '.test_instance_failure_permitted'} ubuntu-2204-master: {extends: '.test_instance_failure_permitted'} ubuntu-2004-master: {extends: '.test_instance_failure_permitted'} -almalinux-9-3007-6: {extends: '.test_instance'} -almalinux-8-3007-6: {extends: '.test_instance'} -amazonlinux-2023-3007-6: {extends: '.test_instance'} -amazonlinux-2-3007-6: {extends: '.test_instance_failure_permitted'} -centos-stream9-3007-6: {extends: '.test_instance'} -debian-12-3007-6: {extends: '.test_instance'} -debian-11-3007-6: {extends: '.test_instance'} -fedora-41-3007-6: {extends: '.test_instance_failure_permitted'} -fedora-40-3007-6: {extends: '.test_instance'} -opensuse-leap-156-3007-6: {extends: '.test_instance'} -opensuse-tmbl-latest-3007-6: {extends: '.test_instance'} -oraclelinux-9-3007-6: {extends: '.test_instance'} -oraclelinux-8-3007-6: {extends: '.test_instance'} -rockylinux-9-3007-6: {extends: '.test_instance'} -rockylinux-8-3007-6: {extends: '.test_instance'} -ubuntu-2404-3007-6: {extends: '.test_instance'} -ubuntu-2204-3007-6: {extends: '.test_instance'} -ubuntu-2004-3007-6: {extends: '.test_instance'} -almalinux-9-3006-14: {extends: '.test_instance'} -almalinux-8-3006-14: {extends: '.test_instance'} -amazonlinux-2023-3006-14: {extends: '.test_instance'} -amazonlinux-2-3006-14: {extends: '.test_instance_failure_permitted'} -centos-stream9-3006-14: {extends: '.test_instance'} -debian-12-3006-14: {extends: '.test_instance'} -debian-11-3006-14: {extends: '.test_instance'} -fedora-41-3006-14: {extends: '.test_instance_failure_permitted'} -fedora-40-3006-14: {extends: '.test_instance'} -opensuse-leap-156-3006-14: {extends: '.test_instance'} -opensuse-tmbl-latest-3006-14: {extends: '.test_instance'} -oraclelinux-9-3006-14: {extends: '.test_instance'} -oraclelinux-8-3006-14: {extends: '.test_instance'} -rockylinux-9-3006-14: {extends: '.test_instance'} -rockylinux-8-3006-14: {extends: '.test_instance'} -ubuntu-2404-3006-14: {extends: '.test_instance'} -ubuntu-2204-3006-14: {extends: '.test_instance'} -ubuntu-2004-3006-14: {extends: '.test_instance'} +almalinux-9-3007-7: {extends: '.test_instance'} +almalinux-8-3007-7: {extends: '.test_instance'} +amazonlinux-2023-3007-7: {extends: '.test_instance'} +amazonlinux-2-3007-7: {extends: '.test_instance_failure_permitted'} +centos-stream9-3007-7: {extends: '.test_instance'} +debian-12-3007-7: {extends: '.test_instance'} +debian-11-3007-7: {extends: '.test_instance'} +fedora-41-3007-7: {extends: '.test_instance_failure_permitted'} +fedora-40-3007-7: {extends: '.test_instance'} +opensuse-leap-156-3007-7: {extends: '.test_instance'} +opensuse-tmbl-latest-3007-7: {extends: '.test_instance'} +oraclelinux-9-3007-7: {extends: '.test_instance'} +oraclelinux-8-3007-7: {extends: '.test_instance'} +rockylinux-9-3007-7: {extends: '.test_instance'} +rockylinux-8-3007-7: {extends: '.test_instance'} +ubuntu-2404-3007-7: {extends: '.test_instance'} +ubuntu-2204-3007-7: {extends: '.test_instance'} +ubuntu-2004-3007-7: {extends: '.test_instance'} +almalinux-9-3006-15: {extends: '.test_instance'} +almalinux-8-3006-15: {extends: '.test_instance'} +amazonlinux-2023-3006-15: {extends: '.test_instance'} +amazonlinux-2-3006-15: {extends: '.test_instance_failure_permitted'} +centos-stream9-3006-15: {extends: '.test_instance'} +debian-12-3006-15: {extends: '.test_instance'} +debian-11-3006-15: {extends: '.test_instance'} +fedora-41-3006-15: {extends: '.test_instance_failure_permitted'} +fedora-40-3006-15: {extends: '.test_instance'} +opensuse-leap-156-3006-15: {extends: '.test_instance'} +opensuse-tmbl-latest-3006-15: {extends: '.test_instance'} +oraclelinux-9-3006-15: {extends: '.test_instance'} +oraclelinux-8-3006-15: {extends: '.test_instance'} +rockylinux-9-3006-15: {extends: '.test_instance'} +rockylinux-8-3006-15: {extends: '.test_instance'} +ubuntu-2404-3006-15: {extends: '.test_instance'} +ubuntu-2204-3006-15: {extends: '.test_instance'} +ubuntu-2004-3006-15: {extends: '.test_instance'} # yamllint enable rule:line-length ############################################################################### diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0e41bce..a3a1b74 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -18,7 +18,7 @@ ci: default_stages: [pre-commit] repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v5.0.0 + rev: v6.0.0 hooks: - id: check-merge-conflict name: Check for Git merge conflicts @@ -30,7 +30,7 @@ repos: - id: commitlint - id: commitlint-ci - repo: https://github.com/rubocop-hq/rubocop - rev: v1.79.0 + rev: v1.80.1 hooks: - id: rubocop name: Check Ruby files with rubocop @@ -100,12 +100,12 @@ repos: )$ additional_dependencies: [pygments==2.16.1] - repo: https://github.com/renovatebot/pre-commit-hooks - rev: 41.43.0 + rev: 41.93.2 hooks: - id: renovate-config-validator name: Check Renovate config with renovate-config-validator - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.33.2 + rev: 0.33.3 hooks: - id: check-github-workflows name: Check GitHub workflows with check-jsonschema diff --git a/kitchen.yml b/kitchen.yml index aea21a2..993630a 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -91,143 +91,143 @@ platforms: driver: image: saltimages/salt-master-py3:rockylinux-8 - ## SALT `3007.6` - - name: debian-12-3007-6 + ## SALT `3007.7` + - name: debian-12-3007-7 driver: - image: saltimages/salt-3007.6-py3:debian-12 + image: saltimages/salt-3007.7-py3:debian-12 run_command: /lib/systemd/systemd - - name: debian-11-3007-6 + - name: debian-11-3007-7 driver: - image: saltimages/salt-3007.6-py3:debian-11 + image: saltimages/salt-3007.7-py3:debian-11 run_command: /lib/systemd/systemd - - name: ubuntu-2404-3007-6 + - name: ubuntu-2404-3007-7 driver: - image: saltimages/salt-3007.6-py3:ubuntu-24.04 + image: saltimages/salt-3007.7-py3:ubuntu-24.04 run_command: /lib/systemd/systemd - - name: ubuntu-2204-3007-6 + - name: ubuntu-2204-3007-7 driver: - image: saltimages/salt-3007.6-py3:ubuntu-22.04 + image: saltimages/salt-3007.7-py3:ubuntu-22.04 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3007-6 + - name: ubuntu-2004-3007-7 driver: - image: saltimages/salt-3007.6-py3:ubuntu-20.04 + image: saltimages/salt-3007.7-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: centos-stream9-3007-6 + - name: centos-stream9-3007-7 driver: - image: saltimages/salt-3007.6-py3:centos-stream9 - - name: opensuse-leap-156-3007-6 + image: saltimages/salt-3007.7-py3:centos-stream9 + - name: opensuse-leap-156-3007-7 driver: - image: saltimages/salt-3007.6-py3:opensuse-leap-15.6 + image: saltimages/salt-3007.7-py3:opensuse-leap-15.6 # Workaround to avoid intermittent failures on `opensuse-leap-15.6`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-tmbl-latest-3007-6 + - name: opensuse-tmbl-latest-3007-7 driver: - image: saltimages/salt-3007.6-py3:opensuse-tumbleweed-latest + image: saltimages/salt-3007.7-py3:opensuse-tumbleweed-latest # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: fedora-41-3007-6 + - name: fedora-41-3007-7 driver: - image: saltimages/salt-3007.6-py3:fedora-41 - - name: fedora-40-3007-6 + image: saltimages/salt-3007.7-py3:fedora-41 + - name: fedora-40-3007-7 driver: - image: saltimages/salt-3007.6-py3:fedora-40 - - name: amazonlinux-2023-3007-6 + image: saltimages/salt-3007.7-py3:fedora-40 + - name: amazonlinux-2023-3007-7 driver: - image: saltimages/salt-3007.6-py3:amazonlinux-2023 - - name: amazonlinux-2-3007-6 + image: saltimages/salt-3007.7-py3:amazonlinux-2023 + - name: amazonlinux-2-3007-7 driver: - image: saltimages/salt-3007.6-py3:amazonlinux-2 - - name: oraclelinux-9-3007-6 + image: saltimages/salt-3007.7-py3:amazonlinux-2 + - name: oraclelinux-9-3007-7 driver: - image: saltimages/salt-3007.6-py3:oraclelinux-9 - - name: oraclelinux-8-3007-6 + image: saltimages/salt-3007.7-py3:oraclelinux-9 + - name: oraclelinux-8-3007-7 driver: - image: saltimages/salt-3007.6-py3:oraclelinux-8 - - name: almalinux-9-3007-6 + image: saltimages/salt-3007.7-py3:oraclelinux-8 + - name: almalinux-9-3007-7 driver: - image: saltimages/salt-3007.6-py3:almalinux-9 - - name: almalinux-8-3007-6 + image: saltimages/salt-3007.7-py3:almalinux-9 + - name: almalinux-8-3007-7 driver: - image: saltimages/salt-3007.6-py3:almalinux-8 - - name: rockylinux-9-3007-6 + image: saltimages/salt-3007.7-py3:almalinux-8 + - name: rockylinux-9-3007-7 driver: - image: saltimages/salt-3007.6-py3:rockylinux-9 - - name: rockylinux-8-3007-6 + image: saltimages/salt-3007.7-py3:rockylinux-9 + - name: rockylinux-8-3007-7 driver: - image: saltimages/salt-3007.6-py3:rockylinux-8 + image: saltimages/salt-3007.7-py3:rockylinux-8 - ## SALT `3006.14` - - name: debian-12-3006-14 + ## SALT `3006.15` + - name: debian-12-3006-15 driver: - image: saltimages/salt-3006.14-py3:debian-12 + image: saltimages/salt-3006.15-py3:debian-12 run_command: /lib/systemd/systemd - - name: debian-11-3006-14 + - name: debian-11-3006-15 driver: - image: saltimages/salt-3006.14-py3:debian-11 + image: saltimages/salt-3006.15-py3:debian-11 run_command: /lib/systemd/systemd - - name: ubuntu-2404-3006-14 + - name: ubuntu-2404-3006-15 driver: - image: saltimages/salt-3006.14-py3:ubuntu-24.04 + image: saltimages/salt-3006.15-py3:ubuntu-24.04 run_command: /lib/systemd/systemd - - name: ubuntu-2204-3006-14 + - name: ubuntu-2204-3006-15 driver: - image: saltimages/salt-3006.14-py3:ubuntu-22.04 + image: saltimages/salt-3006.15-py3:ubuntu-22.04 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3006-14 + - name: ubuntu-2004-3006-15 driver: - image: saltimages/salt-3006.14-py3:ubuntu-20.04 + image: saltimages/salt-3006.15-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: centos-stream9-3006-14 + - name: centos-stream9-3006-15 driver: - image: saltimages/salt-3006.14-py3:centos-stream9 - - name: opensuse-tmbl-latest-3006-14 + image: saltimages/salt-3006.15-py3:centos-stream9 + - name: opensuse-tmbl-latest-3006-15 driver: - image: saltimages/salt-3006.14-py3:opensuse-tumbleweed-latest + image: saltimages/salt-3006.15-py3:opensuse-tumbleweed-latest # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-leap-156-3006-14 + - name: opensuse-leap-156-3006-15 driver: - image: saltimages/salt-3006.14-py3:opensuse-leap-15.6 + image: saltimages/salt-3006.15-py3:opensuse-leap-15.6 # Workaround to avoid intermittent failures on `opensuse-leap-15.6`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: fedora-41-3006-14 + - name: fedora-41-3006-15 driver: - image: saltimages/salt-3006.14-py3:fedora-41 - - name: fedora-40-3006-14 + image: saltimages/salt-3006.15-py3:fedora-41 + - name: fedora-40-3006-15 driver: - image: saltimages/salt-3006.14-py3:fedora-40 - - name: amazonlinux-2023-3006-14 + image: saltimages/salt-3006.15-py3:fedora-40 + - name: amazonlinux-2023-3006-15 driver: - image: saltimages/salt-3006.14-py3:amazonlinux-2023 - - name: amazonlinux-2-3006-14 + image: saltimages/salt-3006.15-py3:amazonlinux-2023 + - name: amazonlinux-2-3006-15 driver: - image: saltimages/salt-3006.14-py3:amazonlinux-2 - - name: oraclelinux-9-3006-14 + image: saltimages/salt-3006.15-py3:amazonlinux-2 + - name: oraclelinux-9-3006-15 driver: - image: saltimages/salt-3006.14-py3:oraclelinux-9 - - name: oraclelinux-8-3006-14 + image: saltimages/salt-3006.15-py3:oraclelinux-9 + - name: oraclelinux-8-3006-15 driver: - image: saltimages/salt-3006.14-py3:oraclelinux-8 - - name: almalinux-9-3006-14 + image: saltimages/salt-3006.15-py3:oraclelinux-8 + - name: almalinux-9-3006-15 driver: - image: saltimages/salt-3006.14-py3:almalinux-9 - - name: almalinux-8-3006-14 + image: saltimages/salt-3006.15-py3:almalinux-9 + - name: almalinux-8-3006-15 driver: - image: saltimages/salt-3006.14-py3:almalinux-8 - - name: rockylinux-9-3006-14 + image: saltimages/salt-3006.15-py3:almalinux-8 + - name: rockylinux-9-3006-15 driver: - image: saltimages/salt-3006.14-py3:rockylinux-9 - - name: rockylinux-8-3006-14 + image: saltimages/salt-3006.15-py3:rockylinux-9 + - name: rockylinux-8-3006-15 driver: - image: saltimages/salt-3006.14-py3:rockylinux-8 + image: saltimages/salt-3006.15-py3:rockylinux-8 ########################################################## # This file is managed as part of a Copier template. # diff --git a/pre-commit_semantic-release.sh b/pre-commit_semantic-release.sh index f869e2d..4437b90 100755 --- a/pre-commit_semantic-release.sh +++ b/pre-commit_semantic-release.sh @@ -11,7 +11,8 @@ sed -i -e "s_^\(version:\).*_\1 ${1}_" FORMULA # (B) Update `AUTHORS.md` ############################################################################### -maintainer contributor --ignore-contributors semantic-release-bot,renovate[bot] +maintainer contributor \ + --ignore-contributors dependabot[bot],renovate[bot],semantic-release-bot ############################################################################### # (C) Use `m2r` to convert automatically produced `.md` docs to `.rst`