diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2414a9984..8dd45b064 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,6 +10,7 @@ permissions:
 
 jobs:
   build:
+    timeout-minutes: 10
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -54,6 +55,7 @@ jobs:
         CI: true
 
   lint:
+    timeout-minutes: 5
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
@@ -68,3 +70,18 @@ jobs:
 
     - name: Lint
       run: npm run lint
+
+  clang-formatter:
+    timeout-minutes: 5
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - uses: DoozyX/clang-format-lint-action@v0.15
+      with:
+        source: 'core'
+        extensions: 'js,ts'
+        # This should be as close as possible to the version that the npm
+        # package supports. This can be found by running:
+        # npx clang-format --version.
+        clangFormatVersion: 15
diff --git a/.github/workflows/check_clang_format.yml b/.github/workflows/check_clang_format.yml
deleted file mode 100644
index 94dc3461f..000000000
--- a/.github/workflows/check_clang_format.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Check clang format
-
-# N.B.: Runs with a read-only repo token.  Safe(ish) to check out the
-# submitted branch.
-on: [pull_request]
-
-permissions:
-  contents: read
-
-jobs:
-  clang-formatter:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-
-    - uses: DoozyX/clang-format-lint-action@v0.15
-      with:
-        source: 'core'
-        extensions: 'js,ts'
-        # This should be as close as possible to the version that the npm
-        # package supports. This can be found by running:
-        # npx clang-format --version.
-        clangFormatVersion: 15
-
-    # The Report clang format workflow (report_clang_format.yml) will
-    # run (if required) after this one to post a comment to the PR.
-    # (Note that the version of that workflow run will be the one on
-    # the master (default) branch, not the PR target branch.)