diff --git a/.travis.yml b/.travis.yml index 773160b02..2f6644c25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,13 +8,13 @@ matrix: - os: linux dist: xenial compiler: gcc - env: MAKE_TARGET=format-verify PATH="/usr/lib/llvm-8/bin:$PATH" + env: MAKE_TARGET=format-verify PATH="/usr/lib/llvm-7/bin:$PATH" addons: apt: sources: - - llvm-toolchain-xenial-8 + - llvm-toolchain-xenial-7 packages: - - clang-format-8 + - clang-format-7 - os: linux dist: xenial compiler: gcc diff --git a/Makefile b/Makefile index 062193c17..274d530e0 100644 --- a/Makefile +++ b/Makefile @@ -244,7 +244,9 @@ format: clang-format -i $$(find jni daemon llarp include libabyss | grep -E '\.[h,c](pp)?$$') format-verify: format - git diff --quiet || echo 'Please run make format!!' && git --no-pager diff && false + (type clang-format) + clang-format --version + git diff --quiet || (echo 'Please run make format!!' && git --no-pager diff ; exit 1) analyze-config: clean mkdir -p '$(BUILD_ROOT)'