Merge branch 'master' into enable-aruco

PhotonVision · Sep 25, 2023 · d47dd69 · d47dd69
2 parents 95066dd + 2cb87c5
commit d47dd69
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -299,6 +299,8 @@ jobs:
           python-version: 3.8
       - name: Install wpiformat
         run: pip3 install wpiformat
+      - name: Check index.html not changed
+        run: git --no-pager diff --exit-code origin/master photon-server/src/main/resources/web/index.html
       - name: Run
         run: wpiformat
       - name: Check output

diff --git a/.gitignore b/.gitignore
@@ -159,3 +159,4 @@ photonlib-cpp-examples/*/vendordeps/*
 
 */networktables.json
 *.sqlite
+photon-server/src/main/resources/web/index.html