From 96f95f4a5fee31142043abab601a753771167421 Mon Sep 17 00:00:00 2001
From: Julien Schmidt <git@julienschmidt.com>
Date: Mon, 4 May 2020 16:28:32 +0200
Subject: [PATCH 1/4] travis: allow master branch to fail

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 40c230105..61f087166 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,10 @@ go:
   - 1.13.x
   - master
 
+jobs:
+  allow_failures:
+  - go: master
+
 before_install:
   - go get golang.org/x/tools/cmd/cover
   - go get github.com/mattn/goveralls

From 5355ba97a4232024f3db63d799afbd0b45ccdfee Mon Sep 17 00:00:00 2001
From: Julien Schmidt <git@julienschmidt.com>
Date: Mon, 4 May 2020 16:35:25 +0200
Subject: [PATCH 2/4] travis: matrix is an alias for jobs

---
 .travis.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 61f087166..abf588a23 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,10 +7,6 @@ go:
   - 1.13.x
   - master
 
-jobs:
-  allow_failures:
-  - go: master
-
 before_install:
   - go get golang.org/x/tools/cmd/cover
   - go get github.com/mattn/goveralls
@@ -21,7 +17,10 @@ before_script:
   - .travis/wait_mysql.sh
   - mysql -e 'create database gotest;'
 
-matrix:
+jobs:
+  allow_failures:
+  - go: master
+
   include:
     - env: DB=MYSQL8
       sudo: required

From 1daf1a95ec7206ca1ab21dc375152d2cfd6ee14a Mon Sep 17 00:00:00 2001
From: Julien Schmidt <git@julienschmidt.com>
Date: Mon, 4 May 2020 16:35:46 +0200
Subject: [PATCH 3/4] travis: remove obsolete sudo key

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index abf588a23..3c8255895 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
-sudo: false
 language: go
 go:
   - 1.10.x

From 7b1bfcd0d0c47724379d6eee484552f076400973 Mon Sep 17 00:00:00 2001
From: Julien Schmidt <git@julienschmidt.com>
Date: Mon, 4 May 2020 16:37:13 +0200
Subject: [PATCH 4/4] travis: remove obsolete sudo keys in jobs matrix

---
 .travis.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3c8255895..506b4f4fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,6 @@ jobs:
 
   include:
     - env: DB=MYSQL8
-      sudo: required
       dist: trusty
       go: 1.10.x
       services:
@@ -42,7 +41,6 @@ jobs:
         - export MYSQL_TEST_CONCURRENT=1
 
     - env: DB=MYSQL57
-      sudo: required
       dist: trusty
       go: 1.10.x
       services:
@@ -62,7 +60,6 @@ jobs:
         - export MYSQL_TEST_CONCURRENT=1
 
     - env: DB=MARIA55
-      sudo: required
       dist: trusty
       go: 1.10.x
       services:
@@ -82,7 +79,6 @@ jobs:
         - export MYSQL_TEST_CONCURRENT=1
 
     - env: DB=MARIA10_1
-      sudo: required
       dist: trusty
       go: 1.10.x
       services: