From aaa7ccb1eb4ef9c49339622ba44a336e15df284e Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@thegeeklab.de>
Date: Thu, 15 Feb 2024 12:16:19 +0100
Subject: [PATCH] chore: revert automerge strategy

---
 base.json       | 14 +++++---------
 docker.json     |  7 +++----
 golang.json     |  8 +++-----
 kubernetes.json |  1 +
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/base.json b/base.json
index 1aa917f..8f4c412 100644
--- a/base.json
+++ b/base.json
@@ -18,21 +18,19 @@
   "packageRules": [
     {
       "description": "Automerge docs theme updates",
+      "extends": ["schedule:daily"],
       "matchDatasources": ["github-releases"],
       "matchPackagePatterns": ["^thegeeklab/hugo-(geekdoc|geekblog)"],
       "matchUpdateTypes": ["minor", "patch"],
-      "automerge": true,
-      "automergeType": "branch",
-      "additionalBranchPrefix": "auto/"
+      "automerge": true
     },
     {
       "description": "Automerge hugo ci updates",
+      "extends": ["schedule:weekly"],
       "matchManagers": ["woodpecker"],
       "matchPackageNames": ["quay.io/thegeeklab/hugo"],
       "matchUpdateTypes": ["patch"],
-      "automerge": true,
-      "automergeType": "branch",
-      "additionalBranchPrefix": "auto/"
+      "automerge": true
     },
     {
       "description": "Automerge dev dependencies",
@@ -40,9 +38,7 @@
       "groupName": "devDeps non-major",
       "matchDepTypes": ["devDependencies", "dev-dependencies", "dev"],
       "matchUpdateTypes": ["pin", "digest", "patch", "minor"],
-      "automerge": true,
-      "automergeType": "branch",
-      "additionalBranchPrefix": "auto/"
+      "automerge": true
     }
   ],
   "customManagers": [
diff --git a/docker.json b/docker.json
index b18d855..ddc8a03 100644
--- a/docker.json
+++ b/docker.json
@@ -12,21 +12,20 @@
     },
     {
       "description": "Automerge digest updates (usually security patches)",
-      "extends": ["schedule:daily"],
       "groupName": "docker digests",
+      "extends": ["schedule:daily"],
       "matchDatasources": ["docker"],
       "matchPackagePatterns": [
         "^((amd64|arm32v7|arm64v8)/)?(python|alpine|node|docker|rockylinux|centos|debian|golang)",
         "^thegeeklab/(alpine|nginx)"
       ],
       "matchUpdateTypes": ["pin", "digest"],
-      "automerge": true,
-      "automergeType": "branch",
-      "additionalBranchPrefix": "auto/"
+      "automerge": true
     },
     {
       "description": "Automerge helper tools for docker base images",
       "groupName": "docker helper tools",
+      "extends": ["schedule:weekly"],
       "matchDatasources": ["github-releases"],
       "matchManagers": ["regex"],
       "matchPackagePatterns": ["^hairyhenderson", "^aptible", "^thegeeklab"],
diff --git a/golang.json b/golang.json
index 7c03dd9..5c6c012 100644
--- a/golang.json
+++ b/golang.json
@@ -11,19 +11,17 @@
   "packageRules": [
     {
       "description": "Automerge golang dev dependencies",
-      "extends": ["schedule:weekly"],
       "groupName": "golang devDeps non-major",
+      "extends": ["schedule:weekly"],
       "matchDatasources": ["github-releases"],
       "matchPackageNames": ["mvdan/gofumpt", "golangci/golangci-lint"],
       "matchUpdateTypes": ["pin", "digest", "patch", "minor"],
-      "automerge": true,
-      "automergeType": "branch",
-      "additionalBranchPrefix": "auto/"
+      "automerge": true
     },
     {
       "description": "Schedule high frequency packages",
-      "extends": ["schedule:weekly"],
       "groupName": "golang highFeq non-major",
+      "extends": ["schedule:weekly"],
       "matchDatasources": ["go"],
       "matchPackagePatterns": ["urfave/cli"],
       "matchUpdateTypes": ["pin", "digest", "patch", "minor"]
diff --git a/kubernetes.json b/kubernetes.json
index d84a36c..c94fa97 100644
--- a/kubernetes.json
+++ b/kubernetes.json
@@ -27,6 +27,7 @@
     {
       "description": "Automerge digest updates (usually security patches)",
       "groupName": "docker digests",
+      "extends": ["schedule:daily"],
       "matchDatasources": ["docker"],
       "matchPackagePatterns": ["^hetznercloud/hcloud-cloud-controller-manager"],
       "matchUpdateTypes": ["pin", "digest"],