From 6d2768208cc474c521f7b49d02ea8ad3d7fdd6ca Mon Sep 17 00:00:00 2001
From: Tom Martensen <tmartens@redhat.com>
Date: Wed, 22 Oct 2025 13:48:51 +0200
Subject: [PATCH 1/2] ROX-31317: disable mintmaker auto-approvals for release
 branches (#2609)

---
 .github/renovate.json5             | 26 ++++++++++++++++++++++++++
 .github/workflows/auto-approve.yml |  4 ++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index e1d865808d..1e6bef2e36 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -72,6 +72,7 @@
     "dockerfile",
     "rpm-lockfile",
   ],
+<<<<<<< HEAD
   "packageRules": [{
     "matchPackageNames": ["/.*/"],
     "groupName": "All updates",
@@ -87,4 +88,29 @@
     "platformAutomerge": true,
   }],
   "labels": ["auto-approve", "build-builder-image", "rebuild-test-container"],
+=======
+  "packageRules": [
+    {
+      "matchPackageNames": [
+        "*",
+      ],
+      "groupName": "All updates",
+      "automerge": true,
+      // A known issue is that some non-Konflux CI jobs currently fail, which may prevent successful auto-merging with a "branch" auto-merge setting.
+      // Therefore, we use PR merge type and have automation approve PRs.
+      "automergeType": "pr",
+      "automergeStrategy": "squash",
+      // Tell Renovate that it can automerge branches at any time of the day.
+      "automergeSchedule": [
+        "at any time",
+      ],
+    }
+  ],
+  "labels": [
+    // Add auto-approve label which triggers the corresponding workflow.
+    "auto-approve",
+    "build-builder-image",
+    "rebuild-test-container",
+  ],
+>>>>>>> 238d8b3f9 (ROX-31317: disable mintmaker auto-approvals for release branches (#2609))
 }
diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml
index fbf3e23325..5277bbace8 100644
--- a/.github/workflows/auto-approve.yml
+++ b/.github/workflows/auto-approve.yml
@@ -7,9 +7,9 @@ on:
 
 jobs:
   auto-approve:
-    name: Auto-approve Konflux updates
+    name: Auto-approve Konflux updates for default branch
     runs-on: ubuntu-latest
-    if: github.actor == 'red-hat-konflux[bot]' && github.event.label.name == 'auto-approve'
+    if: github.actor == 'red-hat-konflux[bot]' && github.event.label.name == 'auto-approve' && github.event.pull_request.base.ref == github.event.pull_request.base.repo.default_branch
     steps:
     - env:
         GH_TOKEN: ${{ secrets.RHACS_BOT_GITHUB_TOKEN }}

From 7ae976afb8f18e48f8bc8cca2da9cbc937db8474 Mon Sep 17 00:00:00 2001
From: Tom Martensen <tmartens@redhat.com>
Date: Wed, 22 Oct 2025 14:40:55 +0200
Subject: [PATCH 2/2] fix merge conflicts

---
 .github/renovate.json5 | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 1e6bef2e36..64174e037a 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -72,23 +72,6 @@
     "dockerfile",
     "rpm-lockfile",
   ],
-<<<<<<< HEAD
-  "packageRules": [{
-    "matchPackageNames": ["/.*/"],
-    "groupName": "All updates",
-    "automerge": true,
-    // A known issue is that some non-Konflux CI jobs in currently fail, which may prevent successful auto-merging with a "branch" auto-merge setting.
-    // Therefore, we use PR merge type and have automation approve PRs.
-    "automergeType": "pr",
-    "automergeStrategy": "squash",
-    // Tell Renovate that it can automerge branches at any time of the day.
-    "automergeSchedule": [
-      "at any time"
-    ],
-    "platformAutomerge": true,
-  }],
-  "labels": ["auto-approve", "build-builder-image", "rebuild-test-container"],
-=======
   "packageRules": [
     {
       "matchPackageNames": [
@@ -112,5 +95,4 @@
     "build-builder-image",
     "rebuild-test-container",
   ],
->>>>>>> 238d8b3f9 (ROX-31317: disable mintmaker auto-approvals for release branches (#2609))
 }