From 5bb1920a5bdc3bc3e958a00e15fc449c3d2b8bd2 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 8 Feb 2020 15:40:06 +0100
Subject: Travis: update linux_gcc7 to linux_gcc8

---
 .travis.yml                         | 10 +++++-----
 travis/linux_gcc7/after_success.sh  |  5 -----
 travis/linux_gcc7/before_install.sh | 20 --------------------
 travis/linux_gcc7/install.sh        |  8 --------
 travis/linux_gcc8/after_success.sh  |  5 +++++
 travis/linux_gcc8/before_install.sh | 20 ++++++++++++++++++++
 travis/linux_gcc8/install.sh        |  8 ++++++++
 7 files changed, 38 insertions(+), 38 deletions(-)
 delete mode 100755 travis/linux_gcc7/after_success.sh
 delete mode 100755 travis/linux_gcc7/before_install.sh
 delete mode 100755 travis/linux_gcc7/install.sh
 create mode 100755 travis/linux_gcc8/after_success.sh
 create mode 100755 travis/linux_gcc8/before_install.sh
 create mode 100755 travis/linux_gcc8/install.sh

diff --git a/.travis.yml b/.travis.yml
index 4cf67068..82b7bbdf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,11 +29,11 @@ matrix:
       services:
         - docker
       env:
-        - BUILD_NAME=linux_gcc7
-        - DETAILS="linux, gcc7, i386"
+        - BUILD_NAME=linux_gcc8
+        - DETAILS="linux, gcc8, i386"
         - ARCH=i386
-        - CC=gcc-7
-        - CXX=g++-7
+        - CC=gcc-8
+        - CXX=g++-8
         - CXXFLAGS='-g -O2 -m32 -D_GLIBCXX_ASSERTIONS'
         - CFLAGS='-g -O2 -m32'
         - TIFF_CFLAGS=-I/usr/include/i386-linux-gnu
@@ -45,7 +45,7 @@ matrix:
           sources:
             - ubuntu-toolchain-r-test
           packages:
-            - g++-7-multilib
+            - g++-8-multilib
             - make
             - autoconf
             - automake
diff --git a/travis/linux_gcc7/after_success.sh b/travis/linux_gcc7/after_success.sh
deleted file mode 100755
index 70c6f5cb..00000000
--- a/travis/linux_gcc7/after_success.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -e
-
-#./travis/after_success.sh
diff --git a/travis/linux_gcc7/before_install.sh b/travis/linux_gcc7/before_install.sh
deleted file mode 100755
index 424bc10e..00000000
--- a/travis/linux_gcc7/before_install.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-set -e
-
-./travis/before_install_apt.sh
-./travis/before_install_pip.sh
-
-sudo apt-get install -qq \
-        lcov \
-        doxygen graphviz \
-        sqlite3 libsqlite3-dev:$ARCH \
-        libtiff-dev:$ARCH libcurl4-openssl-dev:$ARCH
-
-#scripts/cppcheck.sh
-#scripts/doxygen.sh
-
-#pip install --user sphinxcontrib-bibtex
-#pip install --user cpp-coveralls
-
-#./travis/docker.sh
diff --git a/travis/linux_gcc7/install.sh b/travis/linux_gcc7/install.sh
deleted file mode 100755
index 7fa8cfa4..00000000
--- a/travis/linux_gcc7/install.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export CCACHE_CPP2=yes
-export PROJ_DB_CACHE_DIR="$HOME/.ccache"
-
-CC="ccache $CC" CXX="ccache $CXX" CFLAGS="-std=c99 -Werror $CFLAGS" CXXFLAGS="-Werror $CXXFLAGS" ./travis/install.sh
diff --git a/travis/linux_gcc8/after_success.sh b/travis/linux_gcc8/after_success.sh
new file mode 100755
index 00000000..70c6f5cb
--- /dev/null
+++ b/travis/linux_gcc8/after_success.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -e
+
+#./travis/after_success.sh
diff --git a/travis/linux_gcc8/before_install.sh b/travis/linux_gcc8/before_install.sh
new file mode 100755
index 00000000..424bc10e
--- /dev/null
+++ b/travis/linux_gcc8/before_install.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -e
+
+./travis/before_install_apt.sh
+./travis/before_install_pip.sh
+
+sudo apt-get install -qq \
+        lcov \
+        doxygen graphviz \
+        sqlite3 libsqlite3-dev:$ARCH \
+        libtiff-dev:$ARCH libcurl4-openssl-dev:$ARCH
+
+#scripts/cppcheck.sh
+#scripts/doxygen.sh
+
+#pip install --user sphinxcontrib-bibtex
+#pip install --user cpp-coveralls
+
+#./travis/docker.sh
diff --git a/travis/linux_gcc8/install.sh b/travis/linux_gcc8/install.sh
new file mode 100755
index 00000000..7fa8cfa4
--- /dev/null
+++ b/travis/linux_gcc8/install.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+
+export CCACHE_CPP2=yes
+export PROJ_DB_CACHE_DIR="$HOME/.ccache"
+
+CC="ccache $CC" CXX="ccache $CXX" CFLAGS="-std=c99 -Werror $CFLAGS" CXXFLAGS="-Werror $CXXFLAGS" ./travis/install.sh
-- 
cgit v1.2.3