summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Wiederhake <BenWiederhake.GitHub@gmx.de>2020-08-15 13:35:16 +0200
committerAndreas Kling <kling@serenityos.org>2020-08-15 16:49:09 +0200
commit0df9ddf604002095e27e0116fc9b45980c5a1015 (patch)
treea871693c0d81d92fc7e71ec15ef264aa2e482159
parentdca6a7766912133ec70b26516187ea92b1f8eaeb (diff)
downloadserenity-0df9ddf604002095e27e0116fc9b45980c5a1015.zip
Travis: Don't use Python 2, clarify reason of reinstall
This removes the dependency on the dead language python2. Also, when we upgrade the base linux image (in 2020 or maybe 2021?), this entire thing can hopefully be removed.
-rw-r--r--.travis.yml8
1 files changed, 6 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index a604f561a2..5f905108d2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,8 +28,12 @@ before_install:
- 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
-- sudo python2 -m pip install cmake
-- export PATH=/usr/local/bin/:$PATH
+# 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
- cmake --version
script: