summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml87
1 files changed, 41 insertions, 46 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 79db96782..eddc57d05 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ stages:
before_script:
- uname -a
-image: debian:jessie
+image: debian:stretch
variables:
GET_SOURCES_ATTEMPTS: "5"
@@ -12,39 +12,13 @@ variables:
MYSQL_ROOT_PASSWORD: root
packetver: "20170517"
-.build_test:
- stage: build
-
- 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"
- - ./.tools/jobs/cloneall.sh
- - ./.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"
- image: debian:jessie
- services:
- - mysql:latest
-
-.mysql_init_latest:
- stage: build
- script:
- - ./.tools/jobs/install.sh "mysql-client"
- - ./.tools/jobs/clonedata.sh
- - ./.tools/jobs/initdb.sh mysql
- image: debian:jessie
- services:
- - mysql:latest
-
mysql_init_5.6:
stage: build
script:
- ./.tools/jobs/install.sh "mysql-client"
- ./.tools/jobs/clonedata.sh
- ./.tools/jobs/initdb.sh mysql
- image: debian:jessie
+ image: debian:stretch
services:
- mysql:5.6
@@ -54,7 +28,7 @@ mysql_init_5.7:
- ./.tools/jobs/install.sh "mysql-client"
- ./.tools/jobs/clonedata.sh
- ./.tools/jobs/initdb.sh mysql
- image: debian:jessie
+ image: debian:stretch
services:
- mysql:5.7
@@ -74,7 +48,7 @@ mariadb_init_10.0:
- ./.tools/jobs/install.sh "mysql-client"
- ./.tools/jobs/clonedata.sh
- ./.tools/jobs/initdb.sh mariadb
- image: debian:jessie
+ image: debian:stretch
services:
- mariadb:10.0
@@ -84,59 +58,80 @@ mariadb_init_10.0:
- ./.tools/jobs/install.sh "mysql-client"
- ./.tools/jobs/clonedata.sh
- ./.tools/jobs/initdb.sh mariadb
- image: debian:jessie
+ image: debian:stretch
services:
- mariadb:5.5
.mysql_run_latest:
stage: test
script:
- - export CC=gcc-4.9
+ - export CC=gcc-6
- ./.tools/jobs/install.sh "mysql-client
- gcc-4.9
+ gcc-6
git-core
make autoconf automake autopoint
- libtool libmysqlclient-dev libz-dev libpcre3-dev"
+ libtool libmysqlclient-dev libz-dev libpcre3-dev libssl-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
+ image: debian:stretch
services:
- mysql:latest
mysql_run_5.7:
stage: test
script:
- - export CC=gcc-4.9
+ - export CC=gcc-7
- ./.tools/jobs/install.sh "mysql-client
- gcc-4.9
+ gcc-7
git-core
- make autoconf automake autopoint
- libtool libmysqlclient-dev libz-dev libpcre3-dev"
+ make autoconf automake autopoint apt-utils
+ libssl-dev libtool libmysqlclient-dev libz-dev libpcre3-dev"
+ - ls /usr/include/openssl/
+ - grep -nR CRYPTO_new_ex_data /usr/include/openssl/
+ - ls /usr/lib/x86_64-linux-gnu/ | grep libcrypto.so #locate libcrypto.so
- ./.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
+ image: ubuntu:18.04
services:
- mysql:5.7
+mysql_run_8.0:
+ stage: test
+ script:
+ - export CC=gcc-7
+ - ./.tools/jobs/install.sh "mysql-client
+ gcc-7
+ git-core
+ make autoconf automake autopoint
+ libssl-dev 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: ubuntu:18.04
+ services:
+ - mysql:8.0
+ allow_failure: true
+
.mariadb_run_latest:
stage: test
script:
- - export CC=gcc-4.9
+ - export CC=gcc-6
- export HERCCPPFLAGS=" -Wno-format-overflow"
- ./.tools/jobs/install.sh "mysql-client
- gcc-4.9
+ gcc-6
git-core
make autoconf automake autopoint
- libtool libmysqlclient-dev libz-dev libpcre3-dev"
+ libtool libmysqlclient-dev libz-dev libpcre3-dev libssl-dev"
- ./.tools/jobs/cloneall.sh
- ./.tools/jobs/initdb.sh mariadb
- ./.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 mariadb
- image: debian:jessie
+ image: debian:stretch
services:
- mariadb:latest
@@ -148,7 +143,7 @@ mariadb_run_valgrind_latest:
gcc-6
git-core
make autoconf automake autopoint
- libtool libmariadbclient-dev libz-dev libpcre3-dev
+ libssl-dev libtool libmariadbclient-dev libz-dev libpcre3-dev
valgrind"
- ./.tools/jobs/cloneall.sh
- ./.tools/jobs/initdb.sh mariadb
@@ -162,7 +157,7 @@ licensecheck:
stage: test
script:
- ./.tools/jobs/licensecheck.sh
- image: debian:jessie
+ image: debian:stretch
newlines:
stage: test