From bd8fa28ab75dfb02e6a6e2f1e5f151545b1b57e4 Mon Sep 17 00:00:00 2001
From: Sam Freund <samf.236@proton.me>
Date: Mon, 29 Jun 2026 09:01:33 -0700
Subject: [PATCH] move typechecking to lint-format (#2526)

---
 .github/workflows/build.yml       | 21 ---------------------
 .github/workflows/lint-format.yml |  9 +++++++++
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2af90d12c..93f3a1dd5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -91,27 +91,6 @@ jobs:
   #           ./gradlew build
   #           ./gradlew clean
 
-  typecheck-client:
-    name: "Typecheck Client"
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v6
-      - name: Install pnpm
-        uses: pnpm/action-setup@v5
-        with:
-          version: 11
-      - name: Setup Node.js
-        uses: actions/setup-node@v6
-        with:
-          node-version: 24
-          cache: pnpm
-          cache-dependency-path: photon-client/pnpm-lock.yaml
-      - name: Typecheck Client
-        working-directory: photon-client
-        run: |
-          pnpm install --frozen-lockfile
-          pnpm type-check
   playwright-tests:
     name: "Playwright E2E tests"
     runs-on: ubuntu-24.04
diff --git a/.github/workflows/lint-format.yml b/.github/workflows/lint-format.yml
index 6936fadc9..ba556a57c 100644
--- a/.github/workflows/lint-format.yml
+++ b/.github/workflows/lint-format.yml
@@ -109,3 +109,12 @@ jobs:
             echo "::error ::Linting failed. See https://docs.photonvision.org/en/latest/docs/contributing/linting.html"
             exit $exit_code
           fi
+      - name: Run Typechecking
+        run: |
+          set +e
+          pnpm run type-check
+          exit_code=$?
+          if test "$exit_code" -ne "0"; then
+            echo "::error ::Linting failed. See https://docs.photonvision.org/en/latest/docs/contributing/linting.html"
+            exit $exit_code
+          fi