Move travis to newest Ubuntu bionic

minetest · Jul 30, 2019 · 3e87203 · 3e87203
1 parent 037193e
commit 3e87203
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 23 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,20 +2,8 @@ language: cpp
 compiler:
   - gcc
   - clang
-sudo: false
-dist: trusty
-addons:
-  apt:
-    sources:
-      - llvm-toolchain-trusty-5.0
-      - ubuntu-toolchain-r-test
-    packages:
-      - cmake
-      - libgd2-dev
-      - libsqlite3-dev
-      - libleveldb-dev
-      - g++-7
-      - clang-5.0
+dist: bionic
+before_install: sudo apt-get install -y cmake libgd-dev libsqlite3-dev libleveldb-dev
 script: ./util/travis/script.sh
 notifications:
   email: false

diff --git a/util/travis/script.sh b/util/travis/script.sh
@@ -1,15 +1,8 @@
 #!/bin/bash -e
-
-CXX=g++-7
-[ $CC == "clang" ] && CXX=clang++-5.0
-export CXX
-
-
 mkdir -p travisbuild
 cd travisbuild
 
-cmake \
-	-DENABLE_LEVELDB=1 \
-	..
+cmake .. \
+	-DENABLE_LEVELDB=1
 
 make -j2