From 17ab1f149824ac25ee263758a168fd8f58c5e72a Mon Sep 17 00:00:00 2001
From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com>
Date: Mon, 29 Jul 2024 11:19:56 +1000
Subject: [PATCH] ci(renovate): update renovate config (#777)

Enable automerge, lockfile maintenance
---
 .github/renovate.json    | 14 +++++---------
 .github/workflows/pr.yml |  2 ++
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index 9f8fa60e..df453b2f 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -1,10 +1,15 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "configMigration": true,
   "extends": [
     "config:recommended",
+    "group:allNonMajor",
     "schedule:weekly",
     ":approveMajorUpdates",
+    ":automergeBranch",
+    ":automergeMinor",
     ":disablePeerDependencies",
+    ":maintainLockFilesMonthly",
     ":semanticCommits",
     ":semanticCommitTypeAll(chore)"
   ],
@@ -12,14 +17,5 @@
   "labels": ["dependencies"],
   "rangeStrategy": "bump",
   "postUpdateOptions": ["pnpmDedupe"],
-  "packageRules": [
-    {
-      "groupName": "all non-major dependencies",
-      "groupSlug": "all-minor-patch",
-      "matchCurrentVersion": ">=1.0.0",
-      "matchUpdateTypes": ["minor", "patch"],
-      "automerge": true
-    }
-  ],
   "ignoreDeps": ["@types/node", "node", "typescript"]
 }
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 01a0bc6b..cae91f48 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -2,6 +2,8 @@ name: pr
 
 on:
   pull_request:
+  push:
+    branches-ignore: [main, alpha, beta]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.number || github.ref }}