From 0a6246151586912c159694583b006a7fe5b53b4e Mon Sep 17 00:00:00 2001
From: Jonathan Li <jonathan.li@hotmail.co.uk>
Date: Sat, 25 Aug 2018 10:25:03 +0100
Subject: [PATCH] ci: Disable clang-format checks on Travis CI

Unfortunately it's better to disable this for now, due to problems with
clang-format version mismatches between what devs use and what the
buildbot uses. There's also problems with availability of specific
versions on non-Windows systems.
---
 travis.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/travis.sh b/travis.sh
index 98965c1e35..ef7d599b6b 100755
--- a/travis.sh
+++ b/travis.sh
@@ -2,6 +2,7 @@
 
 set -ex
 
+# Disabled for now
 clang_syntax_check() {
 	if [ "${CXX}" = "clang++" ]; then
         ./linux_various/check_format.sh
@@ -16,9 +17,10 @@ linux_32_before_install() {
 
 	# Compilers
 	if [ "${CXX}" = "clang++" ]; then
-		sudo apt-key adv --fetch-keys http://apt.llvm.org/llvm-snapshot.gpg.key
-		sudo add-apt-repository -y "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-${VERSION} main"
-		COMPILER_PACKAGE="g++-8-multilib clang-format-${VERSION}"
+		#sudo apt-key adv --fetch-keys http://apt.llvm.org/llvm-snapshot.gpg.key
+		#sudo add-apt-repository -y "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-${VERSION} main"
+		#COMPILER_PACKAGE="g++-8-multilib clang-format-${VERSION}"
+		COMPILER_PACKAGE="g++-8-multilib"
 	fi
 	if [ "${CXX}" = "g++" ]; then
 		COMPILER_PACKAGE="g++-${VERSION}-multilib"
@@ -136,7 +138,7 @@ before_install|script)
 	${TRAVIS_OS_NAME}_${BITS}_${1}
 	;;
 before_script)
-    clang_syntax_check
+#    clang_syntax_check
     ;;
 after_success)
 	${TRAVIS_OS_NAME}_${1}