From: Lev Stipakov <lev@openvpn.net>
Date: Fri, 29 Nov 2019 10:43:35 +0000 (+0200)
Subject: travis: bump clang version
X-Git-Tag: v2.5_beta1~236
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=424956dc1ec4d85897c41c82d0f3a315799826c2;p=thirdparty%2Fopenvpn.git

travis: bump clang version

This should fix "suggest braces around initialization of subobject"
warning.

Signed-off-by: Lev Stipakov <lev@openvpn.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20191129104335.4518-1-lstipakov@gmail.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg19203.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
---

diff --git a/.travis.yml b/.travis.yml
index 61be17cd4..40296d876 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,16 +46,16 @@ matrix:
     - env: SSLLIB="openssl" EXTRA_CONFIG="--enable-iproute2"
       os: linux
       compiler: gcc
-    - env: SSLLIB="openssl" CFLAGS="-fsanitize=address"
+    - env: SSLLIB="openssl" CFLAGS="-fsanitize=address" CC=clang-9
       os: linux
       compiler: clang
-    - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1c"
+    - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1c" CC=clang-9
       os: linux
       compiler: clang
     - env: SSLLIB="mbedtls"
       os: linux
       compiler: gcc
-    - env: SSLLIB="mbedtls" CFLAGS="-fsanitize=address"
+    - env: SSLLIB="mbedtls" CFLAGS="-fsanitize=address" CC=clang-9
       os: linux
       compiler: clang
     - env: SSLLIB="openssl"
@@ -73,17 +73,21 @@ matrix:
     - env: SSLLIB="openssl" CHOST=i686-w64-mingw32
       os: linux
       compiler: ": Win32 build only"
-    - env: SSLLIB="openssl" EXTRA_CONFIG="--disable-lzo" EXTRA_SCRIPT="make distcheck"
+    - env: SSLLIB="openssl" EXTRA_CONFIG="--disable-lzo" EXTRA_SCRIPT="make distcheck" CC=clang-9
       os: linux
       compiler: clang
-    - env: SSLLIB="openssl" EXTRA_CONFIG="--enable-small"
+    - env: SSLLIB="openssl" EXTRA_CONFIG="--enable-small" CC=clang-9
       os: linux
       compiler: clang
 
 addons:
   apt:
+    sources:
+      - ubuntu-toolchain-r-test
+      - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main'
+        key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
     update: true
-    packages: [ liblzo2-dev, libpam0g-dev, liblz4-dev, linux-libc-dev, man2html, mingw-w64]
+    packages: [ liblzo2-dev, libpam0g-dev, liblz4-dev, linux-libc-dev, man2html, mingw-w64 ]
   homebrew:
     update: true
     packages: [ lzo ]
@@ -95,6 +99,7 @@ cache:
   - ${HOME}/Library/Caches/Homebrew
 
 install:
+  - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$TRAVIS_CPU_ARCH" != "ppc64le" ]; then sudo apt-get install clang-9; fi
   - if [ ! -z "${CHOST}" ]; then unset CC; fi
   - .travis/run-build-deps.sh