ci: update Travis-CI configuration
* Add clang-6.0 to the build matrix (allowed to fail)
* Upgrade xcode9 to xcode9.2
* Various simplifications
Change-Id: I626006f79bbb7a1a79ec804c66ef30fef1e7cfd2
diff --git a/.jenkins.d/10-build.sh b/.jenkins.d/10-build.sh
index 255c7dd..d6f9e37 100755
--- a/.jenkins.d/10-build.sh
+++ b/.jenkins.d/10-build.sh
@@ -10,6 +10,12 @@
git submodule sync
git submodule update
+if [[ $JOB_NAME == *"code-coverage" ]]; then
+ COVERAGE="--with-coverage"
+elif [[ -z $DISABLE_ASAN ]]; then
+ ASAN="--with-sanitizer=address"
+fi
+
# Cleanup
sudo env "PATH=$PATH" ./waf --color=yes distclean
@@ -30,12 +36,7 @@
fi
# Configure/build in debug mode with tests and without precompiled headers
-if [[ $JOB_NAME == *"code-coverage" ]]; then
- COVERAGE="--with-coverage"
-elif [[ -n $BUILD_WITH_ASAN || -z $TRAVIS ]]; then
- ASAN="--with-sanitizer=address"
-fi
-./waf --color=yes configure --debug --with-tests --without-pch $COVERAGE $ASAN
+./waf --color=yes configure --debug --with-tests --without-pch $ASAN $COVERAGE
./waf --color=yes build -j${WAF_JOBS:-1}
# (tests will be run against debug version)