From 41d742f230ac59327037dab7440293c73b25b20d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Brunner?= <stephane.brunner@camptocamp.com>
Date: Fri, 13 Oct 2023 16:44:38 +0200
Subject: [PATCH] CI updates

This is done by the automated script named upgrade-c2cciutils-to-1.7
---
 .github/renovate.json5 | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index f6841ecc..f678622f 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -20,10 +20,12 @@
     automerge: true,
   },
   regexManagers: [
+    /** Do updates on pre-commit additional dependencies */
     {
       fileMatch: ['^\\.pre\\-commit\\-config\\.yaml$'],
       matchStrings: [" +- '?(?<depName>[^' @=]+)(@|==)(?<currentValue>[^' @=]+)'? # (?<datasource>.+)"],
     },
+    /** Do update on the schema present in the ci/config.yaml */
     {
       fileMatch: ['^ci/config\\.yaml$'],
       matchStrings: [
@@ -31,8 +33,9 @@
       ],
       datasourceTemplate: 'github-tags',
     },
+    /** Do update on packages update (trigger a rebuild) */
     {
-      fileMatch: ['^ci/dpkg-versions.yaml$'],
+      fileMatch: ['^ci/dpkg\\-versions\\.yaml$'],
       matchStrings: [" *(?<depName>[^'\\s]+): '?(?<currentValue>[^'\\s/]*[0-9][^'\\s/]*)'?"],
       datasourceTemplate: 'repology',
       versioningTemplate: 'loose',
@@ -45,17 +48,18 @@
     },
   ],
   packageRules: [
-    /** Automerge the patch, the minor and the dev dependency */
+    /** Auto merge the dev dependency update */
     {
       matchDepTypes: ['devDependencies'],
       automerge: true,
     },
-    /** Group the patch and the minor */
+    /** Group and auto merge the patch updates */
     {
       matchUpdateTypes: ['patch'],
       groupName: 'all patch versions',
       automerge: true,
     },
+    /** Group and auto merge the minor updates */
     {
       matchUpdateTypes: ['minor'],
       groupName: 'all minor versions',
@@ -65,7 +69,7 @@
       matchPackageNames: ['scikit-image'],
       groupName: 'scikit-image',
     },
-    /** Accept only the patch on the stabilization branches */
+    /** Accept only the patch on stabilization branches */
     {
       matchBaseBranches: ['master'],
       matchUpdateTypes: ['major', 'minor', 'pin', 'digest', 'lockFileMaintenance', 'rollback', 'bump'],
@@ -82,11 +86,13 @@
     },
     /** Update dpkg versions at any time */
     {
-      matchPaths: ['ci/dpkg-versions.yaml'],
+      matchBaseBranches: ['master'],
+      matchPaths: ['^ci/dpkg\\-versions\\.yaml$'],
       schedule: ['at any time'],
       groupName: 'dpkg',
       automerge: true,
     },
+    /** Support the 4 parts of shellcheck-py version with a v prefix */
     {
       matchPackageNames: ['shellcheck-py/shellcheck-py'],
       versioning: 'regex:^v(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)\\.(?<build>\\d+)$',