From 2f45fc110a839adf578f0e65d34492d0f408ddf4 Mon Sep 17 00:00:00 2001
From: OCram85 <marco.blessing@googlemail.com>
Date: Mon, 2 Jan 2023 13:39:49 +0100
Subject: [PATCH 1/2] fix renovate config keys

---
 .woodpecker/.renovate.yml | 3 ++-
 renovate.json             | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.woodpecker/.renovate.yml b/.woodpecker/.renovate.yml
index dc85ce6..7b5055f 100644
--- a/.woodpecker/.renovate.yml
+++ b/.woodpecker/.renovate.yml
@@ -10,9 +10,10 @@ pipeline:
       RENOVATE_PLATFORM: "gitea"
       RENOVATE_ENDPOINT: "https://gitea.ocram85.com"
       RENOVATE_REPOSITORIES: "${CI_REPO}"
-      RENOVATE_LABELS: "pr/renovate"
+      RENOVATE_LABELS: "renovate"
       #RENOVATE_DRY_RUN: "full"
       RENOVATE_TOKEN: "${RENOVATE_TOKEN}"
+      RENOVATE_GITHUB_TOKEN_WARN: "false"
     when:
       event:
         - push
diff --git a/renovate.json b/renovate.json
index 6c0bc22..658d705 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,4 +1,9 @@
 {
+  "onboardingConfig": {
+    "extends": [
+      "config:base"
+    ]
+  },
   "dependencyDashboard": true,
   "docker": {
     "enabled": true
@@ -6,7 +11,7 @@
   "woodpecker": {
     "enabled": true,
     "fileMatch": [
-      "^.woodpecker/*.yml$"
+      "^.woodpecker\/.*.yml$"
     ]
   }
 }
-- 
2.40.1


From 7647d14f5267bcddd5d52630061b65c7fe72100d Mon Sep 17 00:00:00 2001
From: OCram85 <marco.blessing@googlemail.com>
Date: Mon, 2 Jan 2023 13:49:59 +0100
Subject: [PATCH 2/2] fix merge confict

---
 renovate.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/renovate.json b/renovate.json
index 658d705..aa311e2 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,9 +1,4 @@
 {
-  "onboardingConfig": {
-    "extends": [
-      "config:base"
-    ]
-  },
   "dependencyDashboard": true,
   "docker": {
     "enabled": true
-- 
2.40.1