Skip to content
Permalink
Browse files

Merge pull request #105 from babelouest/improve-ci

Improve ci
  • Loading branch information...
PJK committed Jul 25, 2019
2 parents 46281cc + 254ac56 commit 82512d851205fbc7f65d96a0b4a8e1bad2e4f3c6
Showing with 11 additions and 11 deletions.
  1. +9 −9 .travis-qemu.sh
  2. +2 −2 clang-format.sh
@@ -113,18 +113,18 @@ else
echo "Running tests"
cppcheck . --error-exitcode=1 --suppressions cppcheck_suppressions.txt --force

clang-format -version
clang-format-8 -version
clang-format -version
clang-format-8 -version
./clang-format.sh
git status | grep "nothing to commit, working tree clean"
git diff-index --quiet HEAD

cmake \
-DCBOR_CUSTOM_ALLOC=ON \
-DCMAKE_BUILD_TYPE=Debug \
-DSANITIZE=OFF \
-DWITH_TESTS=ON \
-DCMAKE_PREFIX_PATH=${HOME}/usr/local \
.
-DCBOR_CUSTOM_ALLOC=ON \
-DCMAKE_BUILD_TYPE=Debug \
-DSANITIZE=OFF \
-DWITH_TESTS=ON \
-DCMAKE_PREFIX_PATH=${HOME}/usr/local \
.
make VERBOSE=1

ctest -VV
@@ -3,8 +3,8 @@
# TravisCI workaround to use new clang-format while avoiding painful aliasing
# into the subshell
if which clang-format-8; then
clang-format-8 -style=file -i **/*.c **/*.h **/*.cpp
clang-format-8 --verbose -style=file -i **/*.c **/*.h **/*.cpp
else
clang-format -style=file -i **/*.c **/*.h **/*.cpp
clang-format --verbose -style=file -i **/*.c **/*.h **/*.cpp
fi

0 comments on commit 82512d8

Please sign in to comment.
You can’t perform that action at this time.