Merge pull request #1177 from burningmantech/pre-commit

Add EOF fixer, no commit to master
burningmantech · Apr 20, 2024 · e2184a3 · e2184a3
2 parents afe9b8c + d899de2
commit e2184a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -213,7 +213,6 @@ jobs:
             python-version: "3.13.0-alpha.3"
             optional: true
             tox-prefix: "test"
-            if: github.ref != 'refs/heads/master'
 
     services:
       mysql:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -82,12 +82,15 @@ repos:
       - id: detect-private-key
       - id: end-of-file-fixer
       - id: fix-byte-order-marker
+      - id: end-of-file-fixer
       - id: forbid-new-submodules
       - id: mixed-line-ending
       - id: name-tests-test
         args:
           - --pytest-test-first
       - id: requirements-txt-fixer
+      - id: no-commit-to-branch
+        args: ["--branch", "master"]
       - id: trailing-whitespace
 
   - repo: https://github.com/pre-commit/pygrep-hooks