From 41538fa5449c0cc7da883ed8d15d48e315bb2785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Mon, 14 Aug 2023 15:08:44 +0200 Subject: [PATCH] Update to c2cciutils version 1.6 (CI updates) This is done by the automated script named upgrade-c2cciutils-to-1.6 --- .github/renovate.json5 | 11 +++++++++++ ...auto-review.yaml => dependency-update-review.yaml} | 5 +++-- .pre-commit-config.yaml | 6 ++++++ ci/config.yaml | 2 ++ 4 files changed, 22 insertions(+), 2 deletions(-) rename .github/workflows/{auto-review.yaml => dependency-update-review.yaml} (61%) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 9e7b6d47..a0bf9388 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -19,6 +19,13 @@ fileMatch: ['^.pre-commit-config.yaml$'], matchStrings: [" +- '?(?[^' @=]+)(@|==)(?[^' @=]+)'? # (?.+)"], }, + { + fileMatch: ['^ci/config\\\\.yaml$'], + matchStrings: [ + '.*https://raw\\\\.githubusercontent\\\\.com/(?[^\\\\s]+)/(?[0-9\\\\.]+)/.*', + ], + datasourceTemplate: 'github-tags', + }, ], packageRules: [ /** Docker images versioning */ @@ -67,5 +74,9 @@ matchUpdateTypes: ['major', 'minor', 'pin', 'digest', 'lockFileMaintenance', 'rollback', 'bump'], enabled: false, }, + { + matchPackageNames: ['shellcheck-py/shellcheck-py'], + versioning: 'regex:^v(?\\d+)\\.(?\\d+)\\.(?\\d+)\\.(?\\d+)$', + }, ], } diff --git a/.github/workflows/auto-review.yaml b/.github/workflows/dependency-update-review.yaml similarity index 61% rename from .github/workflows/auto-review.yaml rename to .github/workflows/dependency-update-review.yaml index 342c350f..2d6c98e6 100644 --- a/.github/workflows/auto-review.yaml +++ b/.github/workflows/dependency-update-review.yaml @@ -15,7 +15,8 @@ jobs: steps: - name: Auto reviews updates - uses: golfzaptw/action-auto-reviews-from-branches@master + uses: golfzaptw/action-auto-reviews-from-branches@1.2.3 with: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GOPASS_CI_GITHUB_TOKEN }} AUTHOR: renovate[bot] + if: github.event.pull_request.user.login == 'renovate[bot]' diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1106a0a1..573a091f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -85,6 +85,11 @@ repos: rev: 23.7.0 hooks: - id: black + - repo: https://github.com/sbrunner/jsonschema-validator + rev: 0.1.0 + hooks: + - id: jsonschema-validator + files: ^ci/config\.yaml$ ci: autoupdate_schedule: quarterly skip: @@ -92,3 +97,4 @@ ci: - poetry-check - poetry-lock - ripsecrets + - jsonschema-validator diff --git a/ci/config.yaml b/ci/config.yaml index f5c1400d..bea9319c 100644 --- a/ci/config.yaml +++ b/ci/config.yaml @@ -1,3 +1,5 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/c2cciutils/1.5.8/c2cciutils/schema.json + checks: codespell: ignore_re: