From 7ff0e074e74fd630f3bf90597605c82b4e10ec95 Mon Sep 17 00:00:00 2001 From: Haru Date: Sun, 22 Sep 2019 20:24:49 +0200 Subject: Update the gitlab-ci builds - Changed the i386, gcov and asan build from gcc-6 to gcc-8 as available in buster (now stable) - Moved clang-3.9, clang-5.0 and gcc-4.8 to the secondary stage - Moved clang-4.0, clang-7 and gcc-8 to the primary stage - Added clang-8 - Added mariadb-10.3 - Updated debian image tags to represent more accurately package availability Signed-off-by: Haru --- .gitlab-ci.yml | 257 +++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 166 insertions(+), 91 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 72dbcf1d2..438dbc267 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,7 +35,7 @@ variables: &base_vars pre_re:clang-3.9: <<: *branch_exceptions <<: *prerequisites - stage: primary + stage: secondary image: debian:stretch services: - mariadb:10.1 @@ -50,7 +50,7 @@ pre_re:clang-3.9: re:clang-3.9: <<: *branch_exceptions <<: *prerequisites - stage: primary + stage: secondary image: debian:stretch services: - mariadb:10.1 @@ -80,7 +80,7 @@ zero-2018:clang-3.9: pre_re:clang-4.0: <<: *branch_exceptions <<: *prerequisites - stage: secondary + stage: primary image: debian:stretch services: - mariadb:10.1 @@ -95,7 +95,7 @@ pre_re:clang-4.0: re:clang-4.0: <<: *branch_exceptions <<: *prerequisites - stage: secondary + stage: primary image: debian:stretch services: - mariadb:10.1 @@ -194,8 +194,8 @@ zero-2018:clang-5.0: pre_re:clang-6.0: <<: *branch_exceptions <<: *prerequisites - stage: primary - image: debian:unstable + stage: secondary + image: debian:buster services: - mariadb:10 variables: @@ -209,8 +209,8 @@ pre_re:clang-6.0: re:clang-6.0: <<: *branch_exceptions <<: *prerequisites - stage: primary - image: debian:unstable + stage: secondary + image: debian:buster services: - mariadb:10 variables: @@ -225,7 +225,7 @@ zero-2018:clang-6.0: <<: *branch_exceptions <<: *prerequisites stage: clients - image: debian:unstable + image: debian:buster services: - mariadb:10 variables: @@ -239,8 +239,8 @@ zero-2018:clang-6.0: pre_re:clang-7: <<: *branch_exceptions <<: *prerequisites - stage: secondary - image: debian:unstable + stage: primary + image: debian:buster services: - mariadb:10 variables: @@ -254,8 +254,8 @@ pre_re:clang-7: re:clang-7: <<: *branch_exceptions <<: *prerequisites - stage: secondary - image: debian:unstable + stage: primary + image: debian:buster services: - mariadb:10 variables: @@ -270,7 +270,7 @@ zero-2018:clang-7: <<: *branch_exceptions <<: *prerequisites stage: clients - image: debian:unstable + image: debian:buster services: - mariadb:10 variables: @@ -281,6 +281,51 @@ zero-2018:clang-7: - ./tools/ci/travis.sh build CC=clang-7 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511 - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +pre_re:clang-8: + <<: *branch_exceptions + <<: *prerequisites + stage: secondary + image: debian:unstable + services: + - mariadb:10 + variables: + <<: *base_vars + INSTALL_PACKAGES: clang-8 mariadb-client libmariadbclient-dev-compat + SQLHOST: mariadb + script: + - ./tools/ci/travis.sh build CC=clang-8 --enable-debug --enable-Werror --enable-buildbot --disable-renewal + - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST + +re:clang-8: + <<: *branch_exceptions + <<: *prerequisites + stage: secondary + image: debian:unstable + services: + - mariadb:10 + variables: + <<: *base_vars + INSTALL_PACKAGES: clang-8 mariadb-client libmariadbclient-dev-compat + SQLHOST: mariadb + script: + - ./tools/ci/travis.sh build CC=clang-8 --enable-debug --enable-Werror --enable-buildbot + - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST + +zero-2018:clang-8: + <<: *branch_exceptions + <<: *prerequisites + stage: clients + image: debian:unstable + services: + - mariadb:10 + variables: + <<: *base_vars + INSTALL_PACKAGES: clang-8 mariadb-client libmariadbclient-dev-compat + SQLHOST: mariadb + script: + - ./tools/ci/travis.sh build CC=clang-8 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511 + - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST + pre_re:gcc-4.8: <<: *branch_exceptions <<: *prerequisites @@ -329,7 +374,7 @@ zero-2018:gcc-4.8: pre_re:gcc-4.9: <<: *branch_exceptions <<: *prerequisites - stage: primary + stage: secondary image: debian:jessie services: - mysql:5.5 @@ -344,7 +389,7 @@ pre_re:gcc-4.9: re:gcc-4.9: <<: *branch_exceptions <<: *prerequisites - stage: primary + stage: secondary image: debian:jessie services: - mysql:5.5 @@ -420,7 +465,7 @@ pre_re:gcc-7: <<: *branch_exceptions <<: *prerequisites stage: secondary - image: debian:unstable + image: debian:buster services: - mariadb:10 variables: @@ -435,7 +480,7 @@ re:gcc-7: <<: *branch_exceptions <<: *prerequisites stage: secondary - image: debian:unstable + image: debian:buster services: - mariadb:10 variables: @@ -450,7 +495,7 @@ zero-2018:gcc-7: <<: *branch_exceptions <<: *prerequisites stage: clients - image: debian:unstable + image: debian:buster services: - mariadb:10 variables: @@ -464,8 +509,8 @@ zero-2018:gcc-7: pre_re:gcc-8: <<: *branch_exceptions <<: *prerequisites - stage: secondary - image: debian:unstable + stage: primary + image: debian:buster services: - mariadb:10 variables: @@ -479,8 +524,8 @@ pre_re:gcc-8: re:gcc-8: <<: *branch_exceptions <<: *prerequisites - stage: secondary - image: debian:unstable + stage: primary + image: debian:buster services: - mariadb:10 variables: @@ -495,7 +540,7 @@ zero-2018:gcc-8: <<: *branch_exceptions <<: *prerequisites stage: clients - image: debian:unstable + image: debian:buster services: - mariadb:10 variables: @@ -506,179 +551,179 @@ zero-2018:gcc-8: - ./tools/ci/travis.sh build CC=gcc-8 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511 - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST -pre_re:gcc-6_i386: +pre_re:gcc-8_i386: <<: *branch_exceptions <<: *prerequisites stage: primary image: i386/debian:stable services: - - mariadb:10.1 + - mariadb:10 variables: <<: *base_vars - INSTALL_PACKAGES: gcc-6 mariadb-client libmariadbclient-dev-compat + INSTALL_PACKAGES: gcc-8 mariadb-client libmariadbclient-dev-compat SQLHOST: mariadb script: - - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-renewal + - ./tools/ci/travis.sh build CC=gcc-8 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST -re:gcc-6_i386: +re:gcc-8_i386: <<: *branch_exceptions <<: *prerequisites stage: primary image: i386/debian:stable services: - - mariadb:10.1 + - mariadb:10 variables: <<: *base_vars - INSTALL_PACKAGES: gcc-6 mariadb-client libmariadbclient-dev-compat + INSTALL_PACKAGES: gcc-8 mariadb-client libmariadbclient-dev-compat SQLHOST: mariadb script: - - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot + - ./tools/ci/travis.sh build CC=gcc-8 --enable-debug --enable-Werror --enable-buildbot - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST -zero-2018:gcc-6_i386: +zero-2018:gcc-8_i386: <<: *branch_exceptions <<: *prerequisites stage: clients image: i386/debian:stable services: - - mariadb:10.1 + - mariadb:10 variables: <<: *base_vars - INSTALL_PACKAGES: gcc-6 mariadb-client libmariadbclient-dev-compat + INSTALL_PACKAGES: gcc-8 mariadb-client libmariadbclient-dev-compat SQLHOST: mariadb script: - - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511 + - ./tools/ci/travis.sh build CC=gcc-8 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511 - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST -pre_re:gcc-6_sanitize: +pre_re:gcc-8_sanitize: <<: *branch_exceptions <<: *prerequisites stage: secondary - image: debian:stretch + image: debian:stable services: - - mariadb:10.1 + - mariadb:10 variables: <<: *base_vars - INSTALL_PACKAGES: gcc-6 mariadb-client libmariadbclient-dev-compat + INSTALL_PACKAGES: gcc-8 mariadb-client libmariadbclient-dev-compat SQLHOST: mariadb script: - - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-renewal --disable-manager --enable-sanitize=full + - ./tools/ci/travis.sh build CC=gcc-8 --enable-debug --enable-Werror --enable-buildbot --disable-renewal --disable-manager --enable-sanitize=full - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST -re:gcc-6_sanitize: +re:gcc-8_sanitize: <<: *branch_exceptions <<: *prerequisites stage: secondary - image: debian:stretch + image: debian:stable services: - - mariadb:10.1 + - mariadb:10 variables: <<: *base_vars - INSTALL_PACKAGES: gcc-6 mariadb-client libmariadbclient-dev-compat + INSTALL_PACKAGES: gcc-8 mariadb-client libmariadbclient-dev-compat SQLHOST: mariadb script: - - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-manager --enable-sanitize=full + - ./tools/ci/travis.sh build CC=gcc-8 --enable-debug --enable-Werror --enable-buildbot --disable-manager --enable-sanitize=full - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST -zero-2018:gcc-6_sanitize: +zero-2018:gcc-8_sanitize: <<: *branch_exceptions <<: *prerequisites stage: clients - image: debian:stretch + image: debian:stable services: - - mariadb:10.1 + - mariadb:10 variables: <<: *base_vars - INSTALL_PACKAGES: gcc-6 mariadb-client libmariadbclient-dev-compat + INSTALL_PACKAGES: gcc-8 mariadb-client libmariadbclient-dev-compat SQLHOST: mariadb script: - - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-manager --enable-sanitize=full --enable-packetver-zero --enable-packetver=20180511 + - ./tools/ci/travis.sh build CC=gcc-8 --enable-debug --enable-Werror --enable-buildbot --disable-manager --enable-sanitize=full --enable-packetver-zero --enable-packetver=20180511 - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST -pre_re:gcc-6_i386_sanitize: +pre_re:gcc-8_i386_sanitize: <<: *branch_exceptions <<: *prerequisites stage: secondary image: i386/debian:stable services: - - mariadb:10.1 + - mariadb:10 variables: <<: *base_vars - INSTALL_PACKAGES: gcc-6 mariadb-client libmariadbclient-dev-compat + INSTALL_PACKAGES: gcc-8 mariadb-client libmariadbclient-dev-compat SQLHOST: mariadb script: - - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-renewal --disable-manager --enable-sanitize=full + - ./tools/ci/travis.sh build CC=gcc-8 --enable-debug --enable-Werror --enable-buildbot --disable-renewal --disable-manager --enable-sanitize=full - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST -re:gcc-6_i386_sanitize: +re:gcc-8_i386_sanitize: <<: *branch_exceptions <<: *prerequisites stage: secondary image: i386/debian:stable services: - - mariadb:10.1 + - mariadb:10 variables: <<: *base_vars - INSTALL_PACKAGES: gcc-6 mariadb-client libmariadbclient-dev-compat + INSTALL_PACKAGES: gcc-8 mariadb-client libmariadbclient-dev-compat SQLHOST: mariadb script: - - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-manager --enable-sanitize=full + - ./tools/ci/travis.sh build CC=gcc-8 --enable-debug --enable-Werror --enable-buildbot --disable-manager --enable-sanitize=full - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST -zero-2018:gcc-6_i386_sanitize: +zero-2018:gcc-8_i386_sanitize: <<: *branch_exceptions <<: *prerequisites stage: clients image: i386/debian:stable services: - - mariadb:10.1 + - mariadb:10 variables: <<: *base_vars - INSTALL_PACKAGES: gcc-6 mariadb-client libmariadbclient-dev-compat + INSTALL_PACKAGES: gcc-8 mariadb-client libmariadbclient-dev-compat SQLHOST: mariadb script: - - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-manager --enable-sanitize=full --enable-packetver-zero --enable-packetver=20180511 + - ./tools/ci/travis.sh build CC=gcc-8 --enable-debug --enable-Werror --enable-buildbot --disable-manager --enable-sanitize=full --enable-packetver-zero --enable-packetver=20180511 - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST -pre_re:gcc-6_cov: +pre_re:gcc-8_cov: <<: *branch_exceptions <<: *prerequisites stage: secondary - image: debian:stretch + image: debian:buster services: - - mariadb:10.1 + - mariadb:10 variables: <<: *base_vars - INSTALL_PACKAGES: gcc-6 gcovr mariadb-client libmariadbclient-dev-compat + INSTALL_PACKAGES: gcc-8 gcovr mariadb-client libmariadbclient-dev-compat SQLHOST: mariadb script: - - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-renewal CFLAGS="-coverage" LDFLAGS="-coverage" + - ./tools/ci/travis.sh build CC=gcc-8 --enable-debug --enable-Werror --enable-buildbot --disable-renewal CFLAGS="-coverage" LDFLAGS="-coverage" - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - - gcovr -r . --gcov-executable=gcov-6 -o gcov_pre.txt - - gcovr -r . --gcov-executable=gcov-6 --html -o gcov_pre.html + - gcovr -r . --gcov-executable=gcov-8 -o gcov_pre.txt + - gcovr -r . --gcov-executable=gcov-8 --html -o gcov_pre.html - cat gcov_pre.txt artifacts: paths: - gcov_pre.* when: on_success -re:gcc-6_cov: +re:gcc-8_cov: <<: *branch_exceptions <<: *prerequisites stage: secondary - image: debian:stretch + image: debian:buster services: - - mariadb:10.1 + - mariadb:10 variables: <<: *base_vars - INSTALL_PACKAGES: gcc-6 gcovr mariadb-client libmariadbclient-dev-compat + INSTALL_PACKAGES: gcc-8 gcovr mariadb-client libmariadbclient-dev-compat SQLHOST: mariadb script: - - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot CFLAGS="-coverage" LDFLAGS="-coverage" + - ./tools/ci/travis.sh build CC=gcc-8 --enable-debug --enable-Werror --enable-buildbot CFLAGS="-coverage" LDFLAGS="-coverage" - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - - gcovr -r . --gcov-executable=gcov-6 -o gcov_re.txt - - gcovr -r . --gcov-executable=gcov-6 --html -o gcov_re.html + - gcovr -r . --gcov-executable=gcov-8 -o gcov_re.txt + - gcovr -r . --gcov-executable=gcov-8 --html -o gcov_re.html - cat gcov_re.txt artifacts: paths: @@ -693,11 +738,11 @@ pre_re:debian-oldstable: stage: platforms image: debian:oldstable services: - - mysql:5.5 + - mariadb:10.1 variables: <<: *base_vars - INSTALL_PACKAGES: gcc mysql-client libmysqlclient-dev - SQLHOST: mysql + INSTALL_PACKAGES: gcc mariadb-client libmariadbclient-dev-compat + SQLHOST: mariadb script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST @@ -708,11 +753,11 @@ re:debian-oldstable: stage: platforms image: debian:oldstable services: - - mysql:5.5 + - mariadb:10.1 variables: <<: *base_vars - INSTALL_PACKAGES: gcc mysql-client libmysqlclient-dev - SQLHOST: mysql + INSTALL_PACKAGES: gcc mariadb-client libmariadbclient-dev-compat + SQLHOST: mariadb script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST @@ -723,7 +768,7 @@ pre_re:debian-stable: stage: platforms image: debian:stable services: - - mariadb:10.1 + - mariadb:10.3 variables: <<: *base_vars INSTALL_PACKAGES: gcc mariadb-client libmariadbclient-dev-compat @@ -738,7 +783,7 @@ re:debian-stable: stage: platforms image: debian:stable services: - - mariadb:10.1 + - mariadb:10.3 variables: <<: *base_vars INSTALL_PACKAGES: gcc mariadb-client libmariadbclient-dev-compat @@ -753,7 +798,7 @@ pre_re:debian-testing: stage: platforms image: debian:testing services: - - mariadb:10.1 + - mariadb:10.3 variables: <<: *base_vars INSTALL_PACKAGES: gcc mariadb-client libmariadbclient-dev-compat @@ -768,7 +813,7 @@ re:debian-testing: stage: platforms image: debian:testing services: - - mariadb:10.1 + - mariadb:10.3 variables: <<: *base_vars INSTALL_PACKAGES: gcc mariadb-client libmariadbclient-dev-compat @@ -1045,7 +1090,7 @@ pre_re:mariadb-10.1: <<: *branch_exceptions <<: *prerequisites stage: platforms - image: debian:stable + image: debian:stretch services: - mariadb:10.1 variables: @@ -1060,7 +1105,7 @@ re:mariadb-10.1: <<: *branch_exceptions <<: *prerequisites stage: platforms - image: debian:stable + image: debian:stretch services: - mariadb:10.1 variables: @@ -1071,6 +1116,36 @@ re:mariadb-10.1: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +pre_re:mariadb-10.3: + <<: *branch_exceptions + <<: *prerequisites + stage: platforms + image: debian:buster + services: + - mariadb:10.3 + variables: + <<: *base_vars + INSTALL_PACKAGES: gcc mariadb-client-10.3 libmariadbclient-dev-compat + SQLHOST: mariadb + script: + - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal + - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST + +re:mariadb-10.3: + <<: *branch_exceptions + <<: *prerequisites + stage: platforms + image: debian:buster + services: + - mariadb:10.3 + variables: + <<: *base_vars + INSTALL_PACKAGES: gcc mariadb-client-10.3 libmariadbclient-dev-compat + SQLHOST: mariadb + script: + - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot + - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST + pre_re:mariadb-latest: <<: *branch_exceptions <<: *prerequisites @@ -1150,8 +1225,8 @@ pages: - mv gcov_*.* public/ - cp tools/doxygen/pages_index.html public/index.html dependencies: - - re:gcc-6_cov - - pre_re:gcc-6_cov + - re:gcc-8_cov + - pre_re:gcc-8_cov artifacts: paths: - public -- cgit v1.2.3-60-g2f50