From 3e9d1f1fe48c634f8bf952a1fd587460fc31c501 Mon Sep 17 00:00:00 2001 From: DrChat Date: Fri, 15 Dec 2017 14:00:31 -0600 Subject: [PATCH] [Travis] Swap back to clang --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 998a24148..9cf2329d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,12 +10,12 @@ os: matrix: include: - - compiler: gcc - env: C_COMPILER=gcc-6 CXX_COMPILER=g++-6 LINT=true - - compiler: gcc - env: C_COMPILER=gcc-6 CXX_COMPILER=g++-6 BUILD=true CONFIG=Debug - - compiler: gcc - env: C_COMPILER=gcc-6 CXX_COMPILER=g++-6 BUILD=true CONFIG=Release + - compiler: clang + env: C_COMPILER=clang-3.9 CXX_COMPILER=clang++-3.9 LINT=true + - compiler: clang + env: C_COMPILER=clang-3.9 CXX_COMPILER=clang++-3.9 BUILD=true CONFIG=Debug + - compiler: clang + env: C_COMPILER=clang-3.9 CXX_COMPILER=clang++-3.9 BUILD=true CONFIG=Release allow_failures: # LLVMGold.so is not installed correctly - env: BUILD=true CONFIG=Release @@ -47,8 +47,8 @@ before_script: - $CXX --version - python3 --version # Add Vulkan dependencies - - wget http://mirrors.kernel.org/ubuntu/pool/universe/v/vulkan/libvulkan1_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb - - wget http://mirrors.kernel.org/ubuntu/pool/universe/v/vulkan/libvulkan-dev_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb + - travis_retry wget http://mirrors.kernel.org/ubuntu/pool/universe/v/vulkan/libvulkan1_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb + - travis_retry wget http://mirrors.kernel.org/ubuntu/pool/universe/v/vulkan/libvulkan-dev_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb - sudo dpkg -i libvulkan1_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb libvulkan-dev_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb # Prepare environment (pull dependencies, build tools). - travis_retry ./xenia-build setup