Manually ignore clang-format things

llvm · Oct 18, 2023 · f3b22b0 · f3b22b0
1 parent a076bbb
commit f3b22b0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.devcontainer/default/VSCode/_clang-format b/.devcontainer/default/VSCode/_clang-format
diff --git a/.github/workflows/buildAndTest.yml b/.github/workflows/buildAndTest.yml
@@ -43,7 +43,6 @@ jobs:
           # Base ref is the target branch, in text form (not hash)
           PR_BASE: ${{ github.base_ref }}
         run: |
-          # Run clang-format
           if [ -z "$PR_BASE" ]; then
             DIFF_COMMIT_NAME="HEAD^"
           else
@@ -73,6 +72,10 @@ jobs:
         run: |
           # Run clang-format
           git clang-format $DIFF_COMMIT
+          
+          # clang-format unnecessarily formats some JSON in this directory, and disagrees with VSCode's formatting rules
+          git checkout HEAD -- .devcontainer
+
           git diff --ignore-submodules > clang-format.patch
           if [ -s clang-format.patch ]; then
             echo "Clang-format found formatting problems in the following " \