From bfc8c5f394baf1be5f57352a34c3d05d8475fb5e Mon Sep 17 00:00:00 2001
From: testvalue <wgordon@redhat.com>
Date: Wed, 18 Mar 2026 15:50:16 -0400
Subject: [PATCH 1/3] fix(renovate): narrows custom regex to .jinja files only

---
 .github/renovate.json            | 2 +-
 includes/renovate-template.jinja | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index bcea55c..c87e8a5 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -10,7 +10,7 @@
     {
       "customType": "regex",
       "description": "Update SHA-pinned actions in .jinja template files",
-      "managerFilePatterns": ["/template/.*\\.ya?ml(\\.jinja)?$/", "/includes/.*\\.jinja$/"],
+      "managerFilePatterns": ["/template/.*\\.ya?ml\\.jinja$/", "/includes/.*\\.jinja$/"],
       "matchStrings": ["uses:\\s+(?<depName>[\\w-]+/[\\w-]+)@(?<currentDigest>[a-f0-9]+)\\s+#\\s+(?<currentValue>v[\\S]+)"],
       "datasourceTemplate": "github-releases"
     },
diff --git a/includes/renovate-template.jinja b/includes/renovate-template.jinja
index 663f406..5b4cc67 100644
--- a/includes/renovate-template.jinja
+++ b/includes/renovate-template.jinja
@@ -2,7 +2,7 @@
     {
       "customType": "regex",
       "description": "Update SHA-pinned actions in .jinja template files",
-      "managerFilePatterns": ["/template/.*\\.ya?ml(\\.jinja)?$/", "/includes/.*\\.jinja$/"],
+      "managerFilePatterns": ["/template/.*\\.ya?ml\\.jinja$/", "/includes/.*\\.jinja$/"],
       "matchStrings": ["uses:\\s+(?<depName>[\\w-]+/[\\w-]+)@(?<currentDigest>[a-f0-9]+)\\s+#\\s+(?<currentValue>v[\\S]+)"],
       "datasourceTemplate": "github-releases"
     },

From f8c8864c59ce5f92c826a2f2d03b759c846cc7f4 Mon Sep 17 00:00:00 2001
From: testvalue <wgordon@redhat.com>
Date: Wed, 18 Mar 2026 16:01:35 -0400
Subject: [PATCH 2/3] fix(nix): switches formatter from nixfmt-rfc-style to
 nixfmt-tree

---
 lib/nix/base.nix          | 2 +-
 template/lib/nix/base.nix | 2 +-
 tests/test_nix.py         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/nix/base.nix b/lib/nix/base.nix
index 69e0d24..77068e4 100644
--- a/lib/nix/base.nix
+++ b/lib/nix/base.nix
@@ -15,7 +15,7 @@
 
     formatter = lib.mkOption {
       type = lib.types.package;
-      default = pkgs.nixfmt-rfc-style;
+      default = pkgs.nixfmt-tree;
       description = "Nix formatter package.";
     };
 
diff --git a/template/lib/nix/base.nix b/template/lib/nix/base.nix
index 69e0d24..77068e4 100644
--- a/template/lib/nix/base.nix
+++ b/template/lib/nix/base.nix
@@ -15,7 +15,7 @@
 
     formatter = lib.mkOption {
       type = lib.types.package;
-      default = pkgs.nixfmt-rfc-style;
+      default = pkgs.nixfmt-tree;
       description = "Nix formatter package.";
     };
 
diff --git a/tests/test_nix.py b/tests/test_nix.py
index e3c8580..2ddffd4 100644
--- a/tests/test_nix.py
+++ b/tests/test_nix.py
@@ -47,7 +47,7 @@ def test_flake_outputs(generate_with_nix):
 def test_nix_fmt_clean(generate_with_nix):
     """Generated Nix code passes nixfmt formatting check."""
     result = run_in_project(
-        generate_with_nix, ["nix", "fmt", "--", "--check", "."], check=False
+        generate_with_nix, ["nix", "fmt", "--", "--fail-on-change", "."], check=False
     )
     assert result.returncode == 0, f"nix fmt check failed:\n{result.stderr}"
 

From 7de2d46b1dca50c47b4252d449015152ccf0176e Mon Sep 17 00:00:00 2001
From: testvalue <wgordon@redhat.com>
Date: Wed, 18 Mar 2026 17:19:21 -0400
Subject: [PATCH 3/3] fix(renovate): groups digest updates with non-major
 dependencies

---
 .github/renovate.json                | 2 +-
 template/.github/renovate.json.jinja | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index c87e8a5..b10b48b 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -24,7 +24,7 @@
   ],
   "packageRules": [
     {
-      "matchUpdateTypes": ["minor", "patch"],
+      "matchUpdateTypes": ["minor", "patch", "digest"],
       "groupName": "non-major dependencies",
       "groupSlug": "non-major"
     },
diff --git a/template/.github/renovate.json.jinja b/template/.github/renovate.json.jinja
index 8b28302..a7cb9f8 100644
--- a/template/.github/renovate.json.jinja
+++ b/template/.github/renovate.json.jinja
@@ -11,7 +11,7 @@
   ],
   "packageRules": [
     {
-      "matchUpdateTypes": ["minor", "patch"],
+      "matchUpdateTypes": ["minor", "patch", "digest"],
       "groupName": "non-major dependencies",
       "groupSlug": "non-major"
     },