From: Evgeny Vereshchagin Date: Mon, 29 Jun 2020 14:40:19 +0000 (+0000) Subject: travis: switch to clang-10 X-Git-Tag: v2.36-rc2~30^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d98d4987272bfb220f66c5f89a24e08102d64ec3;p=thirdparty%2Futil-linux.git travis: switch to clang-10 to prepare the infrastructure for https://github.com/karelzak/util-linux/pull/1068 --- diff --git a/.travis-functions.sh b/.travis-functions.sh index 420a4e95db..99ab4288c6 100755 --- a/.travis-functions.sh +++ b/.travis-functions.sh @@ -132,6 +132,11 @@ function travis_install_script # install required packages sudo bash -c "echo 'deb-src http://archive.ubuntu.com/ubuntu/ $(lsb_release -cs) main restricted universe multiverse' >>/etc/apt/sources.list" + + # the following snippet was borrowed from https://apt.llvm.org/llvm.sh + wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - + add-apt-repository -y "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-10 main" + sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test sudo apt-get -qq update --fix-missing sudo apt-get build-dep -y util-linux @@ -150,6 +155,7 @@ function travis_install_script || return sudo apt-get install -y gcc-10 + sudo apt-get install -y clang-10 # install only if available (e.g. Ubuntu Trusty) sudo apt-get install -qq >/dev/null \ diff --git a/.travis.yml b/.travis.yml index f12c4e25b6..ec1284717e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ git: compiler: - gcc-10 - - clang + - clang-10 env: - MAKE_CHECK="nonroot"