From bca771a1fae25ed2cdfb870963ed5e43d9519c06 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sat, 28 Apr 2018 19:10:42 -0300
Subject: Merge evol-server-data with TMW2. Unexpected bugs may show up,
 beware.

Conversion scripts were NOT used
---
 .gitlab-ci.yml | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 47 insertions(+), 2 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1a0083051..71e78c37a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,6 +58,16 @@ mysql_init_5.6:
   services:
   - mysql:5.6
 
+mysql_init_5.7:
+  stage: build
+  script:
+  - ./.tools/jobs/install.sh "mysql-client"
+  - ./.tools/jobs/clonedata.sh
+  - ./.tools/jobs/initdb.sh mysql
+  image: debian:unstable
+  services:
+  - mysql:5.7
+
 mariadb_init_latest:
   stage: build
   script:
@@ -88,7 +98,7 @@ mariadb_init_5.5:
   services:
   - mariadb:5.5
 
-mysql_run_latest:
+.mysql_run_latest:
   stage: test
   script:
   - export CC=gcc-4.9
@@ -105,6 +115,23 @@ mysql_run_latest:
   services:
   - mysql:latest
 
+mysql_run_5.7:
+  stage: test
+  script:
+  - export CC=gcc-4.9
+  - ./.tools/jobs/install.sh "mysql-client
+    gcc-4.9
+    git-core
+    make autoconf automake autopoint
+    libtool libmysqlclient-dev libz-dev libpcre3-dev"
+  - ./.tools/jobs/cloneall.sh
+  - ./.tools/jobs/initdb.sh mysql
+  - ./.tools/jobs/build.sh "--enable-packetver=${packetver} --enable-epoll --enable-debug --enable-sanitize=full --disable-manager --enable-Werror --enable-buildbot" "--enable-werror --enable-lto --enable-sanitize"
+  - ./.tools/jobs/runserver.sh mysql
+  image: debian:jessie
+  services:
+  - mysql:5.7
+
 mariadb_run_latest:
   stage: test
   script:
@@ -122,7 +149,7 @@ mariadb_run_latest:
   services:
   - mariadb:latest
 
-mysql_run_valgrind_latest:
+.mysql_run_valgrind_latest:
   stage: valgrind
   script:
   - export CC=gcc-6
@@ -140,6 +167,24 @@ mysql_run_valgrind_latest:
   services:
   - mysql:latest
 
+mysql_run_valgrind_5.7:
+  stage: valgrind
+  script:
+  - export CC=gcc-6
+  - ./.tools/jobs/install.sh "mysql-client
+    gcc-6
+    git-core
+    make autoconf automake autopoint
+    libtool libmysqlclient-dev libz-dev libpcre3-dev
+    valgrind"
+  - ./.tools/jobs/cloneall.sh
+  - ./.tools/jobs/initdb.sh mysql
+  - ./.tools/jobs/build.sh "--enable-packetver=${packetver} --enable-epoll --enable-debug --disable-manager --enable-Werror --enable-buildbot" "--enable-werror"
+  - ./.tools/jobs/runservervalgrind.sh mysql
+  image: debian:unstable
+  services:
+  - mysql:5.7
+
 mariadb_run_valgrind_latest:
   stage: valgrind
   script:
-- 
cgit v1.2.3-60-g2f50