From cb7d139bd87ae1f7e2ac7f91700925e4f582b2ec Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Thu, 5 Oct 2023 16:45:08 +0200
Subject: [PATCH] Last fixes for renovate #634

---
 renovate-root.json            | 16 ++++++++++++++++
 renovate.json                 | 31 ++++++++++++++++++++++---------
 tools/curl/manifest.yaml      | 12 +++++-------
 tools/mu-repo/manifest.yaml   |  4 +---
 tools/wordcloud/manifest.yaml |  1 +
 5 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/renovate-root.json b/renovate-root.json
index 8327a1d644..97657d7803 100644
--- a/renovate-root.json
+++ b/renovate-root.json
@@ -32,6 +32,22 @@
   "patch":  { "labels": [ "bump/patch", "type/renovate" ] },
   "pin":    { "labels": [ "bump/pin",   "type/renovate" ] },
   "digest": { "labels": [ "bump/digest", "type/renovate" ] },
+  "customDatasources": {
+    "curl": {
+      "defaultRegistryUrlTemplate": "https://api.github.com/repos/curl/curl/releases",
+      "format": "json",
+      "transformTemplates": [
+        "{ \"releases\": [ $[].{ \"version\": $replace( $substring( tag_name, 5 ), '_', '.' ) } ] }"
+      ]
+    },
+    "mu-repo": {
+      "defaultRegistryUrlTemplate": "https://api.github.com/repos/fabioz/mu-repo/git/matching-refs/tags/mu_repo_",
+      "format": "json",
+      "transformTemplates": [
+        "{ \"releases\": [ $[].{ \"version\": $replace( $substring( ref, 18 ), '_', '.') } ] }"
+      ]
+    }
+  },
   "packageRules": [
     {
       "matchDatasources":     [ "docker" ],
diff --git a/renovate.json b/renovate.json
index 742c33746f..69e8df36c1 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,5 +1,21 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "customDatasources": {
+    "curl": {
+      "defaultRegistryUrlTemplate": "https://api.github.com/repos/curl/curl/releases",
+      "format": "json",
+      "transformTemplates": [
+        "{ \"releases\": [ $[].{ \"version\": $replace( $substring( tag_name, 5 ), '_', '.' ) } ] }"
+      ]
+    },
+    "mu-repo": {
+      "defaultRegistryUrlTemplate": "https://api.github.com/repos/fabioz/mu-repo/git/matching-refs/tags/mu_repo_",
+      "format": "json",
+      "transformTemplates": [
+        "{ \"releases\": [ $[].{ \"version\": $replace( $substring( ref, 18 ), '_', '.') } ] }"
+      ]
+    }
+  },
   "digest": {
     "labels": [
       "bump/digest",
@@ -1010,16 +1026,14 @@
       ]
     },
     {
-      "datasourceTemplate": "github-releases",
+      "datasourceTemplate": "custom.curl",
       "depNameTemplate": "curl/curl",
-      "extractVersionTemplate": "^curl-(?<version>\\d+_\\d+_\\d+?)$",
       "fileMatch": [
         "^tools/curl/manifest.yaml$"
       ],
       "matchStrings": [
         "version: \"?(?<currentValue>.*?)\"?\\n"
-      ],
-      "versioningTemplate": "regex:^(?<major>\\d+?)_(?<minor>\\d+?)_(?<patch>\\d+?)$"
+      ]
     },
     {
       "datasourceTemplate": "github-releases",
@@ -4048,16 +4062,14 @@
       ]
     },
     {
-      "datasourceTemplate": "github-tags",
+      "datasourceTemplate": "custom.mu-repo",
       "depNameTemplate": "fabioz/mu-repo",
-      "extractVersionTemplate": "^mu_repo_(?<version>.+?)$",
       "fileMatch": [
         "^tools/mu-repo/manifest.yaml$"
       ],
       "matchStrings": [
         "version: \"?(?<currentValue>.*?)\"?\\n"
-      ],
-      "versioningTemplate": "regex:^(?<major>\\d+?)_(?<minor>\\d+?)_(?<patch>\\d+?)$"
+      ]
     },
     {
       "datasourceTemplate": "github-releases",
@@ -5979,7 +5991,8 @@
       ],
       "matchStrings": [
         "version: \"?(?<currentValue>.*?)\"?\\n"
-      ]
+      ],
+      "versioningTemplate": "loose"
     },
     {
       "datasourceTemplate": "github-tags",
diff --git a/tools/curl/manifest.yaml b/tools/curl/manifest.yaml
index 1cc748d171..c0cb209fc3 100644
--- a/tools/curl/manifest.yaml
+++ b/tools/curl/manifest.yaml
@@ -2,17 +2,15 @@ name: curl
 version: "7.87.0"
 check: ${binary} --version | grep ^curl | cut -d' ' -f2
 platforms:
-  - linux/amd64
+- linux/amd64
 #- linux/arm64
 tags:
-  - type/cli
-  - component/network
-  - lang/c
+- type/cli
+- component/network
+- lang/c
 homepage: https://github.com/curl/curl
 description: Tool and library for transferring data with URL syntax
 renovate:
-  datasource: github-releases
+  datasource: custom.curl
   package: curl/curl
-  extractVersion: ^curl-(?<version>\d+_\d+_\d+?)$
-  versioning: regex:^(?<major>\d+?)_(?<minor>\d+?)_(?<patch>\d+?)$
   priority: low
diff --git a/tools/mu-repo/manifest.yaml b/tools/mu-repo/manifest.yaml
index fca5075936..7530c8106e 100644
--- a/tools/mu-repo/manifest.yaml
+++ b/tools/mu-repo/manifest.yaml
@@ -18,8 +18,6 @@ tags:
 homepage: http://fabioz.github.io/mu-repo
 description: Help in dealing with multiple git repositories
 renovate:
-  datasource: github-tags
+  datasource: custom.mu-repo
   package: fabioz/mu-repo
-  extractVersion: ^mu_repo_(?<version>.+?)$
-  versioning: regex:^(?<major>\d+?)_(?<minor>\d+?)_(?<patch>\d+?)$
   priority: low
\ No newline at end of file
diff --git a/tools/wordcloud/manifest.yaml b/tools/wordcloud/manifest.yaml
index e76effa027..32c0bfba78 100644
--- a/tools/wordcloud/manifest.yaml
+++ b/tools/wordcloud/manifest.yaml
@@ -18,4 +18,5 @@ description: Little word cloud generator in Python
 renovate:
   datasource: pypi
   package: wordcloud
+  versioning: loose
   priority: low