Merge pull request #770 from michael-loki/format_verify_fix

Fix format verify
pull/774/head
Jeff 5 years ago committed by GitHub
commit cf3a31fdd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -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

@ -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)'

Loading…
Cancel
Save