chore: Merge branch 'main' into chore/crd-versioning

Techassi · Techassi · commit 32523a23109b · 2025-05-19T09:50:58.000+02:00
diff --git a/.github/workflows/pr_pre-commit.yaml b/.github/workflows/pr_pre-commit.yaml
@@ -3,6 +3,7 @@ name: pre-commit
 
 on:
   pull_request:
+  merge_group:
 
 env:
   CARGO_TERM_COLOR: always
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -68,7 +68,7 @@ repos:
         language: system
         entry: make regenerate-nix
         stages: [pre-commit, pre-merge-commit]
-        pass_filename: false
+        pass_filenames: false
         files: Cargo\.lock
 
       - id: cargo-test
diff --git a/nix/sources.json b/nix/sources.json
