Merge pull request #54 from xainag/fix-clang

Fix clang invocation
xaynetwork · Sep 11, 2019 · 3777989 · 3777989
2 parents 59679e1 + 6f04f76
commit 3777989
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/.clang-format b/.clang-format
diff --git a/scripts/format.sh b/scripts/format.sh
@@ -9,4 +9,4 @@ cd $DIR/../
 
 isort --indent=4 -rc setup.py conftest.py xain
 black --exclude "xain/grpc/.*_pb2.*" setup.py conftest.py xain
-clang-format -i -style=Google protobuf/xain/grpc/*.proto
+clang-format -style="{Language: Proto, BasedOnStyle: Google}" -i  protobuf/xain/grpc/*.proto
diff --git a/scripts/test.sh b/scripts/test.sh
@@ -11,7 +11,7 @@ isort --check-only --indent=4 -rc setup.py conftest.py xain && echo "===> isort
 black --check --exclude "xain/grpc/.*_pb2.*" setup.py conftest.py xain && echo "===> black says: well done <===" &&
 
 # check format of proto files
-clang-format -style=Google protobuf/xain/grpc/*.proto | diff protobuf/xain/grpc/*.proto - && echo "===> clang-format says: well done <===" &&
+clang-format -style="{Language: Proto, BasedOnStyle: Google}" protobuf/xain/grpc/*.proto | diff protobuf/xain/grpc/*.proto - && echo "===> clang-format says: well done <===" &&
 
 # lint
 pylint --rcfile=pylint.ini xain && echo "===> pylint says: well done <===" &&