Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand All @@ -24,7 +24,7 @@
],
"packageRules": [
{
"matchUpdateTypes": ["minor", "patch"],
"matchUpdateTypes": ["minor", "patch", "digest"],
"groupName": "non-major dependencies",
"groupSlug": "non-major"
},
Expand Down
2 changes: 1 addition & 1 deletion includes/renovate-template.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion lib/nix/base.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

formatter = lib.mkOption {
type = lib.types.package;
default = pkgs.nixfmt-rfc-style;
default = pkgs.nixfmt-tree;
description = "Nix formatter package.";
};

Expand Down
2 changes: 1 addition & 1 deletion template/.github/renovate.json.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
],
"packageRules": [
{
"matchUpdateTypes": ["minor", "patch"],
"matchUpdateTypes": ["minor", "patch", "digest"],
"groupName": "non-major dependencies",
"groupSlug": "non-major"
},
Expand Down
2 changes: 1 addition & 1 deletion template/lib/nix/base.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

formatter = lib.mkOption {
type = lib.types.package;
default = pkgs.nixfmt-rfc-style;
default = pkgs.nixfmt-tree;
description = "Nix formatter package.";
};

Expand Down
2 changes: 1 addition & 1 deletion tests/test_nix.py
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
Loading