summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml58
1 files changed, 2 insertions, 56 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d5e4d23a1..9ddc096a9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,62 +12,8 @@ variables:
MYSQL_ROOT_PASSWORD: root
packetver: "20170517"
-mysql_init_5.7:
- stage: build
- script:
- - ./.tools/jobs/install.sh "mysql-client"
- - ./.tools/jobs/clonedata.sh
- - ./.tools/jobs/initdb.sh mysql
- image: ubuntu:18.04
- services:
- - mysql:5.7
-
-mysql_init_5.8:
- stage: build
- script:
- - ./.tools/jobs/install.sh "mysql-client"
- - ./.tools/jobs/clonedata.sh
- - ./.tools/jobs/initdb.sh mysql
- image: ubuntu:18.04
- services:
- - mysql:8
-
-.mysql_run_latest:
- stage: test
- 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 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: ubuntu:18.04
- services:
- - mysql:latest
-
-mysql_run_5.7:
- stage: test
- script:
- - export CC=gcc-7
- - ./.tools/jobs/install.sh "mysql-client
- gcc-7
- git-core
- make autoconf automake autopoint apt-utils
- libssl-dev openssl 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:5.7
-
mysql_run_8.0:
- stage: test
+ stage: build
script:
- export CC=gcc-7
- ./.tools/jobs/install.sh "mysql-client
@@ -85,7 +31,7 @@ mysql_run_8.0:
allow_failure: true
mysql_run_latest:
- stage: test
+ stage: build
script:
- export CC=gcc-9
- ./.tools/jobs/install.sh "mysql-client