From 58438b6b3e7b20309f79ed5eb2279172f441ac3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Brunner?= <stephane.brunner@camptocamp.com>
Date: Fri, 7 Feb 2025 09:25:32 +0100
Subject: [PATCH] Manual fix

---
 .github/renovate.json5 | 19 ++-----------------
 ci/requirements.txt    |  3 +--
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 79920c238..59d6ac634 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -1,18 +1,16 @@
 {
   extends: [
-    'github>camptocamp/gs-renovate-config-preset:base.json5#0.7.0',
+    'github>camptocamp/gs-renovate-config-preset:base.json5#0.7.1',
     'github>camptocamp/gs-renovate-config-preset:group.json5#0.7.0',
     'github>camptocamp/gs-renovate-config-preset:stabilization-branches.json5#0.7.0',
-    'config:base',
     'github>camptocamp/gs-renovate-config-preset:preset.json5#0.7.0',
     'github>camptocamp/gs-renovate-config-preset:ci.json5#0.7.0',
     'github>camptocamp/gs-renovate-config-preset:pre-commit.json5#0.7.0',
+    'github>camptocamp/gs-renovate-config-preset:docker.json5#0.8.0',
     'github>camptocamp/gs-renovate-config-preset:own.json5#0.7.0',
     'github>camptocamp/gs-renovate-config-preset:json-schema.json5#0.7.0',
     'github>camptocamp/gs-renovate-config-preset:shellcheck.json5#0.7.0',
   ],
-  separateMultipleMajor: true,
-  semanticCommits: 'disabled',
   baseBranches: ['3.28', '3.29', '3.30', '3.31', 'master'],
   customManagers: [
     {
@@ -21,22 +19,9 @@
       datasourceTemplate: 'maven',
       customType: 'regex',
     },
-    /** Do update on the schema present in the ci/config.yaml */
-    {
-      fileMatch: ['^ci/config\\.yaml$'],
-      matchStrings: [
-        '.*https://raw\\.githubusercontent\\.com/(?<depName>[^\\s]+)/(?<currentValue>[0-9\\.]+)/.*',
-      ],
-      datasourceTemplate: 'github-tags',
-      customType: 'regex',
-    },
   ],
   packageRules: [
     /** Docker images versioning */
-    {
-      matchDatasources: ['docker'],
-      versioning: 'loose',
-    },
     {
       matchDatasources: ['docker'],
       versioning: 'regex:^(?<major>\\d+)\\.(?<minor>\\d+)(\\.(?<patch>\\d+))?(-(?<compatibility>.*))$',
diff --git a/ci/requirements.txt b/ci/requirements.txt
index b98576283..a15ebdfc5 100644
--- a/ci/requirements.txt
+++ b/ci/requirements.txt
@@ -1,4 +1,3 @@
-c2cciutils[checks,publish]==1.7.3
-security.md==1.0.0
+c2cciutils==1.7.3
 pre-commit==4.1.0
 tag-publish==0.13.3