diff options
| -rw-r--r-- | .gitlab-ci.yml | 66 |
1 files changed, 9 insertions, 57 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 59e97264b..4297e8314 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: before_script: - uname -a -image: debian:stretch +image: ubuntu:18.04 variables: GET_SOURCES_ATTEMPTS: "5" @@ -12,55 +12,25 @@ variables: MYSQL_ROOT_PASSWORD: root packetver: "20170517" -mysql_init_5.6: - stage: build - script: - - ./.tools/jobs/install.sh "mysql-client" - - ./.tools/jobs/clonedata.sh - - ./.tools/jobs/initdb.sh mysql - image: debian:stretch - 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:stretch + image: ubuntu:18.04 services: - mysql:5.7 -mariadb_init_latest: - stage: build - script: - - ./.tools/jobs/install.sh "mysql-client" - - ./.tools/jobs/clonedata.sh - - ./.tools/jobs/initdb.sh mariadb - image: debian:stretch - services: - - mariadb:latest - -mariadb_init_10.0: +mysql_init_5.8: stage: build script: - ./.tools/jobs/install.sh "mysql-client" - ./.tools/jobs/clonedata.sh - - ./.tools/jobs/initdb.sh mariadb - image: debian:stretch - services: - - mariadb:10.0 - -.mariadb_init_5.5: - stage: build - script: - - ./.tools/jobs/install.sh "mysql-client" - - ./.tools/jobs/clonedata.sh - - ./.tools/jobs/initdb.sh mariadb - image: debian:stretch + - ./.tools/jobs/initdb.sh mysql + image: ubuntu:18.04 services: - - mariadb:5.5 + - mysql:8 .mysql_run_latest: stage: test @@ -75,7 +45,7 @@ mariadb_init_10.0: - ./.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:stretch + image: ubuntu:18.04 services: - mysql:latest @@ -114,24 +84,6 @@ mysql_run_8.0: - mysql:8.0 allow_failure: true -.mariadb_run_latest: - stage: test - script: - - export CC=gcc-6 - - export HERCCPPFLAGS=" -Wno-format-overflow" - - ./.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 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:stretch - services: - - mariadb:latest - # I don't know what's up with Valgrind? .mariadb_run_valgrind_latest: stage: test @@ -151,7 +103,7 @@ mysql_run_8.0: - ./.tools/jobs/initdb.sh mariadb - ./.tools/jobs/build.sh "--enable-packetver=${packetver} --enable-epoll --enable-debug --disable-manager --enable-Werror --enable-buildbot" "--enable-werror" - ./.tools/jobs/runservervalgrind.sh mariadb - image: debian:stretch + image: ubuntu:18.04 services: - mariadb:latest @@ -161,7 +113,7 @@ licensecheck: - lightweight script: - ./.tools/jobs/licensecheck.sh - image: debian:stretch + image: ubuntu:18.04 newlines: stage: test |