From f067fb0aefb00cd5f735d6664b19e42f69376e74 Mon Sep 17 00:00:00 2001 From: Ben Wiederhake Date: Sun, 13 Sep 2020 22:02:29 +0200 Subject: [PATCH] Travis: Switch to Ubuntu Focal --- .travis.yml | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 75bc7be64c5..a2edc4987fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ os: linux -dist: bionic +dist: focal language: cpp @@ -9,7 +9,6 @@ compiler: cache: ccache: true directories: - - /var/cache/apt/archives/*.deb - Toolchain/Cache/ notifications: @@ -23,18 +22,16 @@ notifications: - "Details: %{build_url}" before_install: -- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - sudo apt-get update -qq -- sudo apt-get install -y g++-8 libstdc++-8-dev shellcheck libmpfr-dev libmpc-dev libgmp-dev e2fsprogs qemu-system-i386 qemu-utils -- sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 90 -- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 90 -# Travis ships an old cmake 3.12.4. We need cmake >= 3.16. -# Why would you put binaries there?! -- sudo rm -rf /usr/local/cmake-* -- which cmake || true -- curl -sSf --proto =https --retry 3 --retry-delay 60 https://cmake.org/files/v3.18/cmake-3.18.1-Linux-x86_64.sh > /tmp/cmake-install.sh -- sudo sh /tmp/cmake-install.sh --skip-license --prefix=/usr +# These packages are already part of the Travis image: +#- sudo apt-get install -y g++-9 libstdc++-9-dev cmake shellcheck +# These aren't: +- sudo apt-get install -y libmpfr-dev libmpc-dev libgmp-dev +# If we ever do any qemu-emulation on Travis, we should re-enable this: +#- e2fsprogs qemu-system-i386 qemu-utils +- g++ --version - cmake --version +- shellcheck --version script: - export SERENITY_ROOT="$(pwd)" @@ -57,4 +54,3 @@ script: - cd "$SERENITY_ROOT"/Toolchain/Cache - du -ch * || true - du -sch /home/travis/.ccache/* || true -- du -sch /var/cache/apt/archives/*.deb || true