From d76571ca473e7e0d6e893ff8832e316e55473630 Mon Sep 17 00:00:00 2001
From: JJGadgets <git@jjgadgets.tech>
Date: Thu, 5 Dec 2024 17:54:30 +0800
Subject: [PATCH] fix(renovate): commit message

---
 .renovate/commitMessage.json5 |  2 +-
 .renovate/labels.json5        | 34 +++++++++++++++++-----------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.renovate/commitMessage.json5 b/.renovate/commitMessage.json5
index a09ff925d0..81f32f5af4 100644
--- a/.renovate/commitMessage.json5
+++ b/.renovate/commitMessage.json5
@@ -4,7 +4,7 @@
     {
       "commitMessageTopic": "",
       "semanticCommitScope": "{{datasource}}/{{depName}}",
-      "commitMessageExtra": "{{currentVersion}} ➼ {{newVersion}}"
+      "commitMessageExtra": "{{#if currentVersion}}{{currentVersion}}{{else if currentDigestShort}}{{currentDigestShort}}{{else}}{{currentValue}}{{/if}} ➼ {{#if newVersion}}{{newVersion}}{{else if newDigestShort}}{{newDigestShort}}{{else}}{{newValue}}{{/if}}"
     },
     {
       "matchUpdateTypes": ["major"],
diff --git a/.renovate/labels.json5 b/.renovate/labels.json5
index 07df37a8a2..576d455332 100644
--- a/.renovate/labels.json5
+++ b/.renovate/labels.json5
@@ -18,23 +18,23 @@
     },
     {
       "matchDatasources": ["!docker"],
-      "addLabels": ["renovate/name/{{depNameSanitized}}"]
-    },
-    {
-      "matchDatasources": ["docker"],
-      "matchDepNames": ["*"],
-      "addLabels": ["oci/image/{{depName}}"]
-    },
-    {
-      "matchDatasources": ["docker"],
-      "matchDepNames": ["**/*"],
-      "addLabels": ["oci/owner/{{ lookup (split depName '/') 0 }}", "oci/image/{{ lookup (split depName '/') 1 }}"]
-    },
-    {
-      "matchDatasources": ["docker"],
-      "matchDepNames": ["**/**/**"],
-      "addLabels": ["oci/registry/{{ lookup (split depName '/') 0 }}", "oci/owner/{{ lookup (split depName '/') 1 }}", "oci/image/{{ lookup (split depName '/') 2 }}{{ lookup (split depName '/') 3 }}{{ lookup (split depName '/') 4 }}{{ lookup (split depName '/') 5 }}"]
-    },
+      "addLabels": ["renovate/{{datasource}}/{{depNameSanitized}}"]
+    },
+    //{
+    //  "matchDatasources": ["docker"],
+    //  "matchDepNames": ["*"],
+    //  "addLabels": ["oci/image/{{depName}}"]
+    //},
+    //{
+    //  "matchDatasources": ["docker"],
+    //  "matchDepNames": ["**/*"],
+    //  "addLabels": ["oci/owner/{{ lookup (split depName '/') 0 }}", "oci/image/{{ lookup (split depName '/') 1 }}"]
+    //},
+    //{
+    //  "matchDatasources": ["docker"],
+    //  "matchDepNames": ["**/**/**"],
+    //  "addLabels": ["oci/registry/{{ lookup (split depName '/') 0 }}", "oci/owner/{{ lookup (split depName '/') 1 }}", "oci/image/{{ lookup (split depName '/') 2 }}{{ lookup (split depName '/') 3 }}{{ lookup (split depName '/') 4 }}{{ lookup (split depName '/') 5 }}"]
+    //},
     {
       "addLabels": ["{{#if isVulnerabilityAlert}}security/{{vulnerabilitySeverity}}{{/if}}"]
     }