diff --git a/.github/workflows/cpp-lint.yml b/.github/workflows/cpp-lint.yml
deleted file mode 100644
index 620287485..000000000
--- a/.github/workflows/cpp-lint.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: C++ Lint
-
-on:
-  workflow_call:
-  push:
-    paths:
-      - '**/*.cpp'
-      - '**/*.hpp'
-      - '**/*.c'
-      - '**/*.h'
-      - '.clang-format'
-      - '.github/workflows/cpp-lint.yml'
-  pull_request:
-    paths:
-      - '**/*.cpp'
-      - '**/*.hpp'
-      - '**/*.c'
-      - '**/*.h'
-      - '.clang-format'
-      - '.github/workflows/cpp-lint.yml'
-
-jobs:
-  clang-format:
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v4
-      - uses: DoozyX/clang-format-lint-action@v0.20
-        with:
-          source: '.'
-          clangFormatVersion: 20
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 538faba8f..b41003750 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,19 +16,19 @@ concurrency:
         !startsWith(github.ref, 'refs/heads/gh-readonly-queue') }}
 
 jobs:
-  cpp-lint:
-    uses: ./.github/workflows/cpp-lint.yml
+  pre-commit:
+    uses: ./.github/workflows/pre-commit.yml
   ubuntu:
     needs:
-      - cpp-lint
+      - pre-commit
     uses: ./.github/workflows/ubuntu.yml
   mac:
     needs:
-      - cpp-lint
+      - pre-commit
     uses: ./.github/workflows/mac.yml
   windows:
     needs:
-      - cpp-lint
+      - pre-commit
     uses: ./.github/workflows/windows.yml
   perf:
     needs:
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 3a57d1a2a..2a177140f 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -1,13 +1,9 @@
 name: Pre-commit checks
 
 on:
+  push:
   pull_request:
-    paths-ignore:
-      - 'docs/**'
-      - '*.md'
-      - '*.rst'
-      - '*.txt'
-      - 'LICENSE'
+  workflow_call:
 
 jobs:
   pre-commit:
@@ -28,5 +24,6 @@ jobs:
           python3 -m pip install -r requirements.txt
       - name: Run pre-commit checks
         run: |
-          git fetch origin ${{ github.base_ref }}:${{ github.base_ref }}
-          pre-commit run --from-ref ${{ github.base_ref }} --to-ref HEAD
+          FROM_REF="${{ github.base_ref || 'HEAD~1' }}"
+          git fetch origin $FROM_REF:$FROM_REF || true
+          pre-commit run --from-ref $FROM_REF --to-ref HEAD