From e66146eaa8d82534626f64c6ea99ddc78bfbe82c Mon Sep 17 00:00:00 2001
From: Jeremy <jhatfield82@gmail.com>
Date: Mon, 27 Apr 2026 11:16:30 +0000
Subject: [PATCH 1/2] fix: update renovate configuration to remove feature
 branch pattern and add golangci-lint tracking

---
 .github/renovate.json | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index d2e3b7539..b9f76f343 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -7,7 +7,6 @@
     "helpers:pinGitHubActionDigests"
   ],
   "baseBranchPatterns": [
-    "feature/beta-release",
     "development"
   ],
   "postUpdateOptions": ["npmDedupe"],
@@ -24,6 +23,7 @@
     ".docker/**"
   ],
 
+  "minimumReleaseAge": null,
   "rebaseWhen": "auto",
 
   "vulnerabilityAlerts": {
@@ -242,6 +242,20 @@
       "depNameTemplate": "golang/go",
       "datasourceTemplate": "golang-version",
       "versioningTemplate": "semver"
+    },
+    {
+      "customType": "regex",
+      "description": "Track golangci-lint version in quality checks workflow",
+      "managerFilePatterns": [
+        "/^\\.github/workflows/quality-checks\\.yml$/"
+      ],
+      "matchStrings": [
+        "# renovate: datasource=github-releases depName=golangci/golangci-lint\\n\\s+version: v(?<currentValue>[^\\s]+)"
+      ],
+      "depNameTemplate": "golangci/golangci-lint",
+      "datasourceTemplate": "github-releases",
+      "versioningTemplate": "semver",
+      "extractVersionTemplate": "^v(?<version>.*)"
     }
   ],
 
@@ -264,19 +278,12 @@
       "matchPackageNames": [
         "*"
       ]
-    },
-        {
-      "description": "Feature branches: Auto-merge non-major updates after proven stable",
-      "matchBaseBranches": ["feature/**"],
-      "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
-      "automerge": false
     },
     {
       "description": "Development branch: Auto-merge non-major updates after proven stable",
       "matchBaseBranches": ["development"],
       "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
-      "automerge": false,
-      "minimumReleaseAge": "14 days"
+      "automerge": false
     },
     {
       "description": "Preserve your custom Caddy patch labels but allow them to group into a single PR",

From 48df8c8390772ef9fb5aefe5fd1a843ba0112466 Mon Sep 17 00:00:00 2001
From: Jeremy <jhatfield82@gmail.com>
Date: Mon, 27 Apr 2026 11:17:24 +0000
Subject: [PATCH 2/2] fix: remove downstream propagation logic for development
 branch in workflow

---
 .github/workflows/propagate-changes.yml | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/.github/workflows/propagate-changes.yml b/.github/workflows/propagate-changes.yml
index 0986616e4..4ba1aac21 100644
--- a/.github/workflows/propagate-changes.yml
+++ b/.github/workflows/propagate-changes.yml
@@ -183,27 +183,5 @@ jobs:
                 core.info('Push originated from development (excluded). Skipping propagation back to development.');
               }
             } else if (currentBranch === 'development') {
-              // Development -> Feature/Hotfix branches (The Pittsburgh Model)
-              // We propagate changes from dev DOWN to features/hotfixes so they stay up to date.
-
-              const branches = await github.paginate(github.rest.repos.listBranches, {
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-              });
-
-              // Filter for feature/* and hotfix/* branches using regex
-              // AND exclude the branch that just got merged in (if any)
-              const targetBranches = branches
-                .map(b => b.name)
-                .filter(name => {
-                  const isTargetType = /^feature\/|^hotfix\//.test(name);
-                  const isExcluded = (name === excludedBranch);
-                  return isTargetType && !isExcluded;
-                });
-
-              core.info(`Found ${targetBranches.length} target branches (excluding '${excludedBranch || 'none'}'): ${targetBranches.join(', ')}`);
-
-              for (const targetBranch of targetBranches) {
-                await createPR('development', targetBranch);
-              }
+              core.info('Push to development detected. No downstream propagation configured.');
             }