From aa4d608ec63a9b7f729805e46bb1279dacae82c5 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Thu, 8 Oct 2026 07:41:59 -0700
Subject: [PATCH 1/2] chore(renovate): inherit shared grouping and use the
 reusable validator

---
 .github/workflows/renovate.yml | 28 +++-------------------------
 renovate.json                  |  6 +-----
 2 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml
index 12b84801d..3407d7287 100644
--- a/.github/workflows/renovate.yml
+++ b/.github/workflows/renovate.yml
@@ -1,4 +1,4 @@
-name: Renovate
+name: Renovate Config Validation
 
 on:
   push:
@@ -10,28 +10,6 @@ on:
     paths:
       - renovate.json
 
-permissions: {}
-
 jobs:
-  renovate-config-validator:
-    name: Config validation
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-        with:
-          persist-credentials: false
-          sparse-checkout: |
-            renovate.json
-            .nvmrc
-
-      - uses: voidzero-dev/setup-vp@3754dd7dbdb32bd8f6d28b6043de13ad3a75f21f # v1.21.1
-        with:
-          cache: true
-          run-install: 'false'
-          node-version-file: '.nvmrc'
-
-      - name: Validate Renovate config
-        # pnpm 12 dlx ignores workspace allowBuilds (installs under ~/.cache/pnpm/dlx)
-        # and fails with ERR_PNPM_IGNORED_BUILDS for renovate's optional addons.
-        run: npx --yes --ignore-scripts --package renovate -- renovate-config-validator
+  validate:
+    uses: gitify-app/.github/.github/workflows/renovate-config-validator.yml@main
diff --git a/renovate.json b/renovate.json
index ea5d41b8b..f3c43e2f1 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,11 +1,7 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["github>gitify-app/.github", "group:vitePlus"],
+  "extends": ["github>gitify-app/.github", "helpers:disableTypesNodeMajor"],
   "packageRules": [
-    {
-      "matchDepTypes": ["engines"],
-      "rangeStrategy": "auto"
-    },
     {
       "description": "Fetch changelog details for twemoji packages",
       "matchPackageNames": ["@discordapp/twemoji"],

From 6e76e23d20e8167f9e1f18463cfdc3528081cba6 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Thu, 8 Oct 2026 14:33:50 -0700
Subject: [PATCH 2/2] fix(ci): secure reusable Renovate validator workflow

---
 .github/workflows/renovate.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml
index 3407d7287..a8cb256e0 100644
--- a/.github/workflows/renovate.yml
+++ b/.github/workflows/renovate.yml
@@ -10,6 +10,9 @@ on:
     paths:
       - renovate.json
 
+permissions:
+  contents: read
+
 jobs:
   validate:
-    uses: gitify-app/.github/.github/workflows/renovate-config-validator.yml@main
+    uses: gitify-app/.github/.github/workflows/renovate-config-validator.yml@000f921e8c370889fa00093ce9ce910fcefcc470 # main