From f92457d41a392c2549c044efe40651186db62d10 Mon Sep 17 00:00:00 2001
From: Carl Csaposs <carl.csaposs@canonical.com>
Date: Wed, 18 Dec 2024 08:18:21 +0000
Subject: [PATCH] patch: Remove workaround from Renovate config example (#254)

Issue appears to be resolved (might have been fixed by fix for
https://github.com/renovatebot/renovate/issues/21848)
---
 README.md | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 3cf970d6..bffac57e 100644
--- a/README.md
+++ b/README.md
@@ -37,23 +37,17 @@ Example Renovate configuration:
     {
       "matchManagers": ["poetry"],
       "matchPackageNames": ["canonical/data-platform-workflows"],
-      // Workaround for https://github.com/renovatebot/renovate/discussions/23628
-      "versioning": "semver",
-      "groupName": "data-platform-workflows",
-      // Workaround: data-platform-workflows Python packages use git tags instead of pyproject.toml
-      // for versioning. Therefore, Renovate will always think an update is a major version update.
-      "separateMajorMinor": false
+      // Ensure Renovate prefers vX.0.0 tag (e.g. "v24.0.0") over vX tag (e.g. "v24") if vX.X.X tag
+      // currently in use
+      // (Matches default versioning of "github-actions" manager)
+      "versioning": "docker",
+      "groupName": "data-platform-workflows"
     },
     {
       "matchManagers": ["github-actions"],
       "matchPackageNames": ["canonical/data-platform-workflows"],
-      "groupName": "data-platform-workflows",
-      // Workaround: data-platform-workflows Python packages use git tags instead of pyproject.toml
-      // for versioning. Therefore, Renovate will always think an update is a major version update.
-      // Since we want packages to be updated alongside workflows (actions), we must disable
-      // separate major PRs for workflows as well.
-      "separateMajorMinor": false
-    }
+      "groupName": "data-platform-workflows"
+    },
   ]
 }