release-3.23: disable renovate automerge (#2612)

* ROX-31317: disable mintmaker auto-approvals for release branches (#2609)

* fix merge conflicts

Author: tommartensen

.github/renovate.json5

@@ -72,19 +72,27 @@
     "dockerfile",
     "rpm-lockfile",
   ],
-  "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": [
+        "*",
+      ],
+      "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",
+  ],
 }

.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 }}