From ce3b7897336cf1cdc1298a1b337ee836f596a5d4 Mon Sep 17 00:00:00 2001
From: Benjamin Morel <benjamin.morel@gmail.com>
Date: Fri, 1 Jun 2018 00:16:48 +0200
Subject: [PATCH] Test MySQL 8

---
 .travis.yml                 | 22 +++++++++-------------
 travis/install-mysql-5.7.sh |  5 +++--
 travis/install-mysql-8.0.sh |  7 +++++++
 3 files changed, 19 insertions(+), 15 deletions(-)
 create mode 100644 travis/install-mysql-8.0.sh

diff --git a/.travis.yml b/.travis.yml
index 185a76f6..87e896c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,26 +1,22 @@
 language: php
-dist: trusty
 sudo: required
 
 php:
   - 7.1
-  - 7.2
-  - 7.3
 
-env:
-  - ENGINE=PDO_MYSQL56
-  - ENGINE=PDO_MYSQL57
-  - ENGINE=PDO_MYSQL_MARIADB55
-  - ENGINE=PDO_MYSQL_MARIADB10
-  - ENGINE=PDO_PGSQL
-  - ENGINE=SQLite3
-  - ENGINE=GEOS34
-  - ENGINE=GEOS35
-  - ENGINE=GEOS36
+matrix:
+  include:
+    - dist: trusty
+      env: ENGINE=PDO_MYSQL56
+    - dist: trusty
+      env: ENGINE=PDO_MYSQL57
+    - dist: xenial
+      env: ENGINE=PDO_MYSQL80
 
 before_script:
   - if [[ $ENGINE = PDO_MYSQL56 ]]; then ENGINE=PDO_MYSQL; fi;
   - if [[ $ENGINE = PDO_MYSQL57 ]]; then ENGINE=PDO_MYSQL; sudo bash travis/install-mysql-5.7.sh; fi;
+  - if [[ $ENGINE = PDO_MYSQL80 ]]; then ENGINE=PDO_MYSQL; sudo bash travis/install-mysql-8.0.sh; fi;
   - if [[ $ENGINE = PDO_MYSQL_MARIADB55 ]]; then ENGINE=PDO_MYSQL; sudo VERSION=5.5 bash travis/install-mariadb.sh; fi;
   - if [[ $ENGINE = PDO_MYSQL_MARIADB10 ]]; then ENGINE=PDO_MYSQL; sudo VERSION=10.0 bash travis/install-mariadb.sh; fi;
   - if [[ $ENGINE = PDO_PGSQL ]]; then bash travis/install-postgis.sh; fi;
diff --git a/travis/install-mysql-5.7.sh b/travis/install-mysql-5.7.sh
index 9fb5b2a0..0e075a06 100644
--- a/travis/install-mysql-5.7.sh
+++ b/travis/install-mysql-5.7.sh
@@ -1,6 +1,7 @@
 echo mysql-apt-config mysql-apt-config/select-server select mysql-5.7 | sudo debconf-set-selections
-wget http://dev.mysql.com/get/mysql-apt-config_0.7.3-1_all.deb
-sudo dpkg --install mysql-apt-config_0.7.3-1_all.deb
+wget https://dev.mysql.com/get/mysql-apt-config_0.8.10-1_all.deb
+sudo dpkg --install mysql-apt-config_0.8.10-1_all.deb
 sudo apt-get update -q
 sudo apt-get install -q -y --force-yes -o Dpkg::Options::=--force-confnew mysql-server
+sudo /etc/init.d/mysql start
 sudo mysql_upgrade
diff --git a/travis/install-mysql-8.0.sh b/travis/install-mysql-8.0.sh
new file mode 100644
index 00000000..6540d6ae
--- /dev/null
+++ b/travis/install-mysql-8.0.sh
@@ -0,0 +1,7 @@
+echo mysql-apt-config mysql-apt-config/select-server select mysql-8.0 | sudo debconf-set-selections
+wget https://dev.mysql.com/get/mysql-apt-config_0.8.10-1_all.deb
+sudo dpkg --install mysql-apt-config_0.8.10-1_all.deb
+sudo apt-get update -q
+sudo apt-get install -q -y --force-yes -o Dpkg::Options::=--force-confnew mysql-server
+sudo /etc/init.d/mysql start
+sudo mysql_upgrade