roll-back linter changes in CI

getsentry · Nov 1, 2024 · 6245b45 · 6245b45
1 parent 5108c95
commit 6245b45
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,10 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: |
-          sudo apt update
-          sudo apt install clang-format-15
-          make style-15
+      - run: make style
 
   build-ios:
     name: Xcode Build for iOS

diff --git a/Makefile b/Makefile
@@ -83,9 +83,3 @@ style: setup-venv
 	@.venv/bin/python ./scripts/check-clang-format.py -r examples include src tests/unit
 	@.venv/bin/black --diff --check tests
 .PHONY: style
-
-# TODO: workaround for clang-format 15+ where local formatting breaks with clang-format-14 based style checks on CI
-style-15: setup-venv
-	@.venv/bin/python ./scripts/check-clang-format.py --clang-format-executable /usr/bin/clang-format-15 -r examples include src tests/unit
-	@.venv/bin/black --diff --check tests
-.PHONY: style-15