diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c7dc061..2c1af85 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,11 +4,17 @@
 name: main
 
 on:
-  push:
-    branches:
-      - "**"
+  pull_request:
+  merge_group:
 
 jobs:
+  typos-check:
+    name: Typos Check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: crate-ci/typos@v1.19.0
+
   formatting-check:
     name: Formatting Check
     runs-on: ubuntu-latest
@@ -20,7 +26,7 @@ jobs:
   test-windows:
     runs-on: windows-latest
     steps:
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             /Users/runneradmin/AppData/Local/bazelisk
@@ -35,7 +41,7 @@ jobs:
   test-linux:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cache/bazelisk
diff --git a/typos.toml b/typos.toml
new file mode 100644
index 0000000..3ffc3da
--- /dev/null
+++ b/typos.toml
@@ -0,0 +1,5 @@
+[files]
+extend-exclude = ["CHANGELOG.md"]
+
+[default]
+extend-ignore-re = ["(?Rm)^.*(#|//)\\s*typos:disable-line$"]