From 245876cddb6989dcad78f13aff9cd0d1cefa150e Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Sun, 8 Mar 2020 21:03:44 +0100
Subject: Update travis build infrastructure

Ubuntu 14.04 -> 18.04
clang-format, clang-tidy 7 -> 8
clang 3.6 -> 3.9
clang 7 -> 9
---
 util/travis/common.sh | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'util')

diff --git a/util/travis/common.sh b/util/travis/common.sh
index b4406866e..092a46577 100644
--- a/util/travis/common.sh
+++ b/util/travis/common.sh
@@ -1,31 +1,28 @@
 #!/bin/bash -e
 
 set_linux_compiler_env() {
-	if [[ "${COMPILER}" == "gcc-5.1" ]]; then
-		export CC=gcc-5.1
-		export CXX=g++-5.1
-	elif [[ "${COMPILER}" == "gcc-6" ]]; then
+	if [[ "${COMPILER}" == "gcc-6" ]]; then
 		export CC=gcc-6
 		export CXX=g++-6
 	elif [[ "${COMPILER}" == "gcc-8" ]]; then
 		export CC=gcc-8
 		export CXX=g++-8
-	elif [[ "${COMPILER}" == "clang-3.6" ]]; then
-		export CC=clang-3.6
-		export CXX=clang++-3.6
-	elif [[ "${COMPILER}" == "clang-7" ]]; then
-		export CC=clang-7
-		export CXX=clang++-7
+	elif [[ "${COMPILER}" == "clang-3.9" ]]; then
+		export CC=clang-3.9
+		export CXX=clang++-3.9
+	elif [[ "${COMPILER}" == "clang-9" ]]; then
+		export CC=clang-9
+		export CXX=clang++-9
 	fi
 }
 
 # Linux build only
 install_linux_deps() {
 	sudo apt-get update
-	sudo apt-get install libirrlicht-dev cmake libbz2-dev libpng12-dev \
+	sudo apt-get install libirrlicht-dev cmake libbz2-dev libpng-dev \
 		libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev \
 		libhiredis-dev libogg-dev libgmp-dev libvorbis-dev libopenal-dev \
-		gettext libpq-dev libleveldb-dev
+		gettext libpq-dev libpqtypes-dev libleveldb-dev
 }
 
 # Mac OSX build only
-- 
cgit v1.2.3