]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
travis: switch to clang-10
authorEvgeny Vereshchagin <evvers@ya.ru>
Mon, 29 Jun 2020 14:40:19 +0000 (14:40 +0000)
committerEvgeny Vereshchagin <evvers@ya.ru>
Mon, 29 Jun 2020 14:54:26 +0000 (14:54 +0000)
to prepare the infrastructure for https://github.com/karelzak/util-linux/pull/1068

.travis-functions.sh
.travis.yml

index 420a4e95dbf375c01ca409fdf0a13120cee97793..99ab4288c6822883db10c94cb4a3d0b62875be5e 100755 (executable)
@@ -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 \
index f12c4e25b609ac386f9e3bed7a2bd3bc1aa8263b..ec1284717ecd36c4395e6a82fc8cd9e751c10876 100644 (file)
@@ -8,7 +8,7 @@ git:
 
 compiler:
   - gcc-10
-  - clang
+  - clang-10
 
 env:
   - MAKE_CHECK="nonroot"