From 22dd74479f7cc0d2ff8f5396d2341319072c086d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Brunner?= <stephane.brunner@camptocamp.com>
Date: Mon, 30 Sep 2024 11:19:49 +0200
Subject: [PATCH 1/2] CI updates

This is done by the automated script named upgrade-c2cciutils-to-1.7
---
 .github/renovate.json5  | 12 ------------
 .pre-commit-config.yaml |  4 ++++
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index ba21cd9bb04..f075f798ff9 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -56,12 +56,6 @@
       groupName: 'all minor versions',
       automerge: true,
     },
-    /** Accept only the patch on the stabilization branches */
-    {
-      matchBaseBranches: ['/[0-9]\\..*/'],
-      matchUpdateTypes: ['major', 'minor', 'pin', 'digest', 'lockFileMaintenance', 'rollback', 'bump'],
-      enabled: false,
-    },
     /** Group Poetry packages */
     {
       matchPackagePrefixes: ['poetry-'],
@@ -74,12 +68,6 @@
       versioning: 'regex:^v(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)\\.(?<build>\\d+)$',
       matchDepNames: ['shellcheck-py/shellcheck-py'],
     },
-    /** Accept only the patch on stabilization branches */
-    {
-      matchBaseBranches: ['/^[0-9]+\\.[0-9]+$/'],
-      matchUpdateTypes: ['major', 'minor', 'pin', 'digest', 'lockFileMaintenance', 'rollback', 'bump'],
-      enabled: false,
-    },
     /** Group and auto merge the CI dependencies */
     {
       matchFileNames: ['.github/**', '.pre-commit-config.yaml', 'ci/**'],
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7fd8be6b005..e86651a29a1 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -197,3 +197,7 @@ repos:
           - --ignore-numbers
           - --ignore-acronyms
           - --en-us
+  - repo: https://github.com/renovatebot/pre-commit-hooks
+    rev: 37.428.1
+    hooks:
+      - id: renovate-config-validator

From 11de8ad574a109b61f7edbf570f2c9daaf86433c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Brunner?= <stephane.brunner@camptocamp.com>
Date: Mon, 30 Sep 2024 11:38:47 +0200
Subject: [PATCH 2/2] Remove extra matchBaseBranches

---
 .github/renovate.json5 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index f075f798ff9..8d80802df62 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -35,7 +35,6 @@
   packageRules: [
     /** Automerge the patch, the minor and the dev dependency */
     {
-      matchBaseBranches: ['master'],
       matchUpdateTypes: ['minor', 'patch'],
       automerge: true,
     },