From ba74f76f3729811acc7cb7cea04e36368bb4a95b Mon Sep 17 00:00:00 2001
From: Rene Milk <rene.milk@wwu.de>
Date: Wed, 13 Apr 2016 14:36:16 +0200
Subject: [PATCH] [travis] move format check to after_script
---
.travis.yml | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index e4b678758..88c59b224 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -72,18 +72,17 @@ script:
- ${SRC_DCTRL} ${DCTRL_ARG} --only=${MY_MODULE} bexec ${BUILD_CMD} test
# retry this step becuase of the implicated race condition in cloning an pushing with multiple builder running in parallel
- travis_retry $HOME/src/scripts/bash/travis_upload_test_logs.bash ${DUNE_BUILD_DIR}/${MY_MODULE}/dune/xt/*/test/
-
- - |
- if [ "x${CLANG_FORMAT}" != "x" ] ; then
- git config --global hooks.clangformat ${CLANG_FORMAT}
- PYTHONPATH=$HOME/src/scripts/python/ python3 -c "import travis_report as tp; tp.clang_format_status(\"${TRAVIS_BUILD_DIR}\")"
- fi
- ${SRC_DCTRL} ${DCTRL_ARG} --only=${MY_MODULE} bexec ${BUILD_CMD} headercheck
- ${SRC_DCTRL} ${DCTRL_ARG} --only=${MY_MODULE} bexec ${BUILD_CMD} install | grep -v "Installing"
- ${SRC_DCTRL} ${DCTRL_ARG} --only=${MY_MODULE} bexec ${BUILD_CMD} package_source
# runs independent of 'script' failure/success
after_script:
+ - |
+ if [ "x${CLANG_FORMAT}" != "x" ] ; then
+ git config --global hooks.clangformat ${CLANG_FORMAT}
+ PYTHONPATH=$HOME/src/scripts/python/ python3 -c "import travis_report as tp; tp.clang_format_status(\"${TRAVIS_BUILD_DIR}\")"
+ fi
# reset for ctest
- ${SRC_DCTRL} ${DCTRL_ARG} --only=${MY_MODULE} bexec make clean
- export CTEST_ARG="--output-on-failure -S ${TRAVIS_BUILD_DIR}/.travis.ctest"
--
GitLab