From bc3f65a4f790100760858cc5438ec44c758f7d0e Mon Sep 17 00:00:00 2001 From: Techassi Date: Tue, 22 Apr 2025 17:04:19 +0200 Subject: [PATCH 1/3] chore(template): Add regenerate-nix to pre-commit config --- template/.pre-commit-config.yaml.j2 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/template/.pre-commit-config.yaml.j2 b/template/.pre-commit-config.yaml.j2 index c76c18e9..485b3249 100644 --- a/template/.pre-commit-config.yaml.j2 +++ b/template/.pre-commit-config.yaml.j2 @@ -62,6 +62,14 @@ repos: stages: [pre-commit, pre-merge-commit, manual] pass_filenames: false + - id: regenerate-nix + name: regenerate-nix + language: system + entry: make regenerate-nix + stages: [pre-commit, pre-merge-commit] + pass_filename: false + files: Cargo\.lock + - id: cargo-test name: cargo-test language: system From aa998bda19987aeccf0abe3074b655b256083fc4 Mon Sep 17 00:00:00 2001 From: Techassi Date: Tue, 22 Apr 2025 17:05:02 +0200 Subject: [PATCH 2/3] perf(template): Only run regenerate-charts on relevant changes --- template/.pre-commit-config.yaml.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/template/.pre-commit-config.yaml.j2 b/template/.pre-commit-config.yaml.j2 index 485b3249..4af1b0f2 100644 --- a/template/.pre-commit-config.yaml.j2 +++ b/template/.pre-commit-config.yaml.j2 @@ -61,6 +61,7 @@ repos: entry: make regenerate-charts stages: [pre-commit, pre-merge-commit, manual] pass_filenames: false + files: \.rs$|Cargo\.(toml|lock) - id: regenerate-nix name: regenerate-nix From 9a13ef9323cb99fae9e05eece025bcaa330ffda0 Mon Sep 17 00:00:00 2001 From: Techassi Date: Tue, 22 Apr 2025 17:05:40 +0200 Subject: [PATCH 3/3] perf(template): Adjust stages which run local pre-commit hooks --- template/.pre-commit-config.yaml.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/template/.pre-commit-config.yaml.j2 b/template/.pre-commit-config.yaml.j2 index 4af1b0f2..01689872 100644 --- a/template/.pre-commit-config.yaml.j2 +++ b/template/.pre-commit-config.yaml.j2 @@ -59,7 +59,7 @@ repos: name: regenerate-charts language: system entry: make regenerate-charts - stages: [pre-commit, pre-merge-commit, manual] + stages: [pre-commit, pre-merge-commit] pass_filenames: false files: \.rs$|Cargo\.(toml|lock) @@ -75,7 +75,7 @@ repos: name: cargo-test language: system entry: cargo test - stages: [pre-commit, pre-merge-commit, manual] + stages: [pre-commit, pre-merge-commit] pass_filenames: false files: \.rs$|Cargo\.(toml|lock) @@ -83,7 +83,7 @@ repos: name: cargo-rustfmt language: system entry: cargo +{[rust_nightly_version}] fmt --all -- --check - stages: [pre-commit] + stages: [pre-commit, pre-merge-commit] pass_filenames: false files: \.rs$ @@ -91,6 +91,6 @@ repos: name: cargo-clippy language: system entry: cargo clippy --all-targets -- -D warnings - stages: [pre-commit] + stages: [pre-commit, pre-merge-commit] pass_filenames: false files: \.rs$