From: Evgeny Vereshchagin Date: Mon, 29 Jun 2020 13:56:06 +0000 (+0000) Subject: travis: switch to gcc-10 X-Git-Tag: v2.36-rc2~30^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f99c2464e7fae69e6f1353fdb46aca91ae0694a3;p=thirdparty%2Futil-linux.git travis: switch to gcc-10 to get around an ASan bug mentioned in https://github.com/karelzak/util-linux/issues/1076 --- diff --git a/.travis-functions.sh b/.travis-functions.sh index 53066525ad..420a4e95db 100755 --- a/.travis-functions.sh +++ b/.travis-functions.sh @@ -132,6 +132,7 @@ 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" + 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 sudo apt-get install -qq >/dev/null \ @@ -148,6 +149,8 @@ function travis_install_script socat \ || return + sudo apt-get install -y gcc-10 + # install only if available (e.g. Ubuntu Trusty) sudo apt-get install -qq >/dev/null \ libsystemd-daemon-dev \ diff --git a/.travis.yml b/.travis.yml index 85797e8308..f12c4e25b6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ git: depth: 1500 compiler: - - gcc + - gcc-10 - clang env: