diff --git a/.clang-tidy b/.clang-tidy
index 861332a8f2..bbfbd5c7db 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,2 +1,2 @@
-Checks: '-*,clang-analyzer-core.*,clang-analyzer-deadcode.*,readability-*,-readability-magic-numbers,-readability-else-after-return,-readability-named-parameter,-readability-braces-around-statements,-readability-isolate-declaration,-readability-uppercase-literal-suffix,-readability-function-size,-readability-non-const-parameter,-clang-diagnostic-error'
+Checks: '-*,clang-analyzer-core.*,clang-analyzer-deadcode.*,readability-*,-readability-magic-numbers,-readability-else-after-return,-readability-named-parameter,-readability-braces-around-statements,-readability-isolate-declaration,-readability-uppercase-literal-suffix,-readability-function-size,-readability-non-const-parameter'
 HeaderFilterRegex: '(src|include)\/.*\.h'
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 61956f6155..29a5706a47 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -1,13 +1,11 @@
 name: Lint
 on:
-  push:
-    paths:
-      - 'src/*'
-      - 'include/*'
   pull_request:
     paths:
       - 'src/*'
       - 'include/*'
+      - 'format.sh'
+      - '.clang-tidy'
 
 jobs:
   build:
@@ -18,18 +16,9 @@ jobs:
 
       - run: sudo apt-get install -y astyle clang-tidy
 
-      # lint files changed by the push/pr
-      - id: files
-        uses: trilom/file-changes-action@v1.2.4
-        with:
-          output: ' '
-        continue-on-error: true
-      - run: ./format.sh ${{ steps.files.outputs.files}}
-        if: ${{ steps.files.outcome == 'success' }}
       - run: ./format.sh
-        if: ${{ steps.files.outcome == 'failure' }}
 
-      # fail if any files were changed by ./format.sh
+      # Detect any files changed by ./format.sh
       - id: files_formatted
         uses: jackton1/find-changed-files@v1.1
         with:
diff --git a/format.sh b/format.sh
index 4e464c9780..16adddc764 100755
--- a/format.sh
+++ b/format.sh
@@ -33,4 +33,7 @@ astyle ${FILES} \
 find ${FILES} -exec sed -i -e '$a\' {} \;
 
 # lint
-clang-tidy -p . ${FILES} -- ${COMPILER_OPTS}
+C_FILES=$(echo "$FILES" | grep '\.c$')
+if [[ ! -z $C_FILES ]]; then
+    clang-tidy -p . ${C_FILES} -- ${COMPILER_OPTS}
+fi
diff --git a/src/code_e79b0_len_1920.c b/src/code_e79b0_len_1920.c
index 7adcf12f0d..3ef4d877bd 100644
--- a/src/code_e79b0_len_1920.c
+++ b/src/code_e79b0_len_1920.c
@@ -227,7 +227,8 @@ ScriptInstance* start_script(Bytecode* initialLine, s32 priority, s32 initialSta
     return newScript;
 }
 #else
-INCLUDE_ASM(ScriptInstance*, "code_e79b0_len_1920", start_script, Bytecode* initialLine, s32 priority, s32 initialState);
+INCLUDE_ASM(ScriptInstance*, "code_e79b0_len_1920", start_script, Bytecode* initialLine, s32 priority,
+            s32 initialState);
 #endif
 
 #ifdef NON_MATCHING