From b1efc18d7041dbb60cfa52b1b3938587de76410b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 4 Oct 2016 16:52:00 +0300 Subject: Remove useless parts from .gitlab-ci.yml --- .gitlab-ci.yml | 704 ++++------------------------------------------------- tools/ci/travis.sh | 1 + 2 files changed, 52 insertions(+), 653 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 15d6112c4..3d93d7029 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ stages: - secondary - platforms - clients - - extras +# - extras variables: &base_vars # Configure mysql service (https://hub.docker.com/_/mysql/) @@ -12,7 +12,7 @@ variables: &base_vars MYSQL_PASSWORD: 'ragnarok' MYSQL_ALLOW_EMPTY_PASSWORD: 'yes' GIT_DEPTH: '3' - DEBIAN_COMMON_PACKAGES: make zlib1g-dev libpcre3-dev git python + DEBIAN_COMMON_PACKAGES: make autoconf zlib1g-dev libpcre3-dev git python .prerequisites: &prerequisites before_script: @@ -20,8 +20,10 @@ variables: &base_vars - uname -a - ./tools/ci/retry.sh apt-get update - ./tools/ci/retry.sh apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES - - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST - - ./tools/ci/travis.sh getplugins || true +# - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh getplugins || true + services: + - mysql:latest .branch_exceptions: &branch_exceptions only: @@ -32,180 +34,6 @@ variables: &base_vars # Compilers -pre_re:clang-3.9: - <<: *branch_exceptions - <<: *prerequisites - stage: secondary - image: debian:stretch - services: - - mariadb:10.1 - variables: - <<: *base_vars - INSTALL_PACKAGES: clang-3.9 mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build CC=clang-3.9 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -re:clang-3.9: - <<: *branch_exceptions - <<: *prerequisites - stage: secondary - image: debian:stretch - services: - - mariadb:10.1 - variables: - <<: *base_vars - INSTALL_PACKAGES: clang-3.9 mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build CC=clang-3.9 --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -zero-2018:clang-3.9: - <<: *branch_exceptions - <<: *prerequisites - stage: clients - image: debian:stretch - services: - - mariadb:10.1 - variables: - <<: *base_vars - INSTALL_PACKAGES: clang-3.9 mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build CC=clang-3.9 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511 - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:clang-4.0: - <<: *branch_exceptions - <<: *prerequisites - stage: primary - image: debian:stretch - services: - - mariadb:10.1 - variables: - <<: *base_vars - INSTALL_PACKAGES: clang-4.0 mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build CC=clang-4.0 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -re:clang-4.0: - <<: *branch_exceptions - <<: *prerequisites - stage: primary - image: debian:stretch - services: - - mariadb:10.1 - variables: - <<: *base_vars - INSTALL_PACKAGES: clang-4.0 mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build CC=clang-4.0 --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -zero-2018:clang-4.0: - <<: *branch_exceptions - <<: *prerequisites - stage: clients - image: debian:stretch - services: - - mariadb:10.1 - variables: - <<: *base_vars - INSTALL_PACKAGES: clang-4.0 mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build CC=clang-4.0 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511 - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:clang-5.0: - <<: *branch_exceptions - before_script: - - echo "Building $CI_BUILD_NAME" - - uname -a - - echo 'deb http://ftp.debian.org/debian stretch-backports main' >> /etc/apt/sources.list - - ./tools/ci/retry.sh apt-get update - - ./tools/ci/retry.sh apt-get install -t stretch-backports -y -qq clang-5.0 - - ./tools/ci/retry.sh apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES - - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST - - ./tools/ci/travis.sh getplugins || true - stage: secondary - image: debian:stretch - services: - - mariadb:10.1 - variables: - <<: *base_vars - INSTALL_PACKAGES: mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build CC=clang-5.0 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -re:clang-5.0: - <<: *branch_exceptions - before_script: - - echo "Building $CI_BUILD_NAME" - - uname -a - - echo 'deb http://ftp.debian.org/debian stretch-backports main' >> /etc/apt/sources.list - - ./tools/ci/retry.sh apt-get update - - ./tools/ci/retry.sh apt-get install -t stretch-backports -y -qq clang-5.0 - - ./tools/ci/retry.sh apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES - - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST - - ./tools/ci/travis.sh getplugins || true - stage: secondary - image: debian:stretch - services: - - mariadb:10.1 - variables: - <<: *base_vars - INSTALL_PACKAGES: mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build CC=clang-5.0 --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -zero-2018:clang-5.0: - <<: *branch_exceptions - before_script: - - echo "Building $CI_BUILD_NAME" - - uname -a - - echo 'deb http://ftp.debian.org/debian stretch-backports main' >> /etc/apt/sources.list - - ./tools/ci/retry.sh apt-get update - - ./tools/ci/retry.sh apt-get install -t stretch-backports -y -qq clang-5.0 - - ./tools/ci/retry.sh apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES - - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST - - ./tools/ci/travis.sh getplugins || true - stage: clients - image: debian:stretch - services: - - mariadb:10.1 - variables: - <<: *base_vars - INSTALL_PACKAGES: mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build CC=clang-5.0 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511 - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:clang-6.0: - <<: *branch_exceptions - <<: *prerequisites - stage: secondary - image: debian:buster - services: - - mariadb:10 - variables: - <<: *base_vars - INSTALL_PACKAGES: clang-6.0 mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build CC=clang-6.0 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - re:clang-6.0: <<: *branch_exceptions <<: *prerequisites @@ -219,7 +47,7 @@ re:clang-6.0: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=clang-6.0 --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST zero-2018:clang-6.0: <<: *branch_exceptions @@ -234,22 +62,7 @@ zero-2018:clang-6.0: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=clang-6.0 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511 - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:clang-7: - <<: *branch_exceptions - <<: *prerequisites - stage: primary - image: debian:buster - services: - - mariadb:10 - variables: - <<: *base_vars - INSTALL_PACKAGES: clang-7 mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build CC=clang-7 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:clang-7: <<: *branch_exceptions @@ -264,7 +77,7 @@ re:clang-7: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=clang-7 --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST zero-2018:clang-7: <<: *branch_exceptions @@ -279,7 +92,7 @@ zero-2018:clang-7: SQLHOST: mariadb script: - ./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 +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST pre_re:clang-8: <<: *branch_exceptions @@ -339,7 +152,7 @@ pre_re:gcc-4.8: SQLHOST: mysql script: - ./tools/ci/travis.sh build CC=gcc-4.8 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:gcc-4.8: <<: *branch_exceptions @@ -354,7 +167,7 @@ re:gcc-4.8: SQLHOST: mysql script: - ./tools/ci/travis.sh build CC=gcc-4.8 --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST zero-2018:gcc-4.8: <<: *branch_exceptions @@ -369,22 +182,7 @@ zero-2018:gcc-4.8: SQLHOST: mysql script: - ./tools/ci/travis.sh build CC=gcc-4.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.9: - <<: *branch_exceptions - <<: *prerequisites - stage: secondary - image: debian:jessie - services: - - mysql:5.5 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc-4.9 mysql-client libmysqlclient-dev - SQLHOST: mysql - script: - - ./tools/ci/travis.sh build CC=gcc-4.9 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:gcc-4.9: <<: *branch_exceptions @@ -399,7 +197,7 @@ re:gcc-4.9: SQLHOST: mysql script: - ./tools/ci/travis.sh build CC=gcc-4.9 --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST zero-2018:gcc-4.9: <<: *branch_exceptions @@ -414,22 +212,7 @@ zero-2018:gcc-4.9: SQLHOST: mysql script: - ./tools/ci/travis.sh build CC=gcc-4.9 --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: - <<: *branch_exceptions - <<: *prerequisites - stage: primary - image: debian:stretch - services: - - mariadb:10.1 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc-6 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 test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:gcc-6: <<: *branch_exceptions @@ -444,7 +227,7 @@ re:gcc-6: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST zero-2018:gcc-6: <<: *branch_exceptions @@ -459,22 +242,7 @@ zero-2018:gcc-6: 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 test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:gcc-7: - <<: *branch_exceptions - <<: *prerequisites - stage: secondary - image: debian:buster - services: - - mariadb:10 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc-7 mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./tools/ci/travis.sh build CC=gcc-7 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:gcc-7: <<: *branch_exceptions @@ -489,7 +257,7 @@ re:gcc-7: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=gcc-7 --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST zero-2018:gcc-7: <<: *branch_exceptions @@ -504,22 +272,7 @@ zero-2018:gcc-7: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=gcc-7 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511 - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:gcc-8: - <<: *branch_exceptions - <<: *prerequisites - stage: primary - image: debian:buster - services: - - mariadb:10 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc-8 mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./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 +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:gcc-8: <<: *branch_exceptions @@ -534,7 +287,7 @@ re:gcc-8: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=gcc-8 --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST zero-2018:gcc-8: <<: *branch_exceptions @@ -549,28 +302,13 @@ zero-2018:gcc-8: SQLHOST: mariadb script: - ./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-8_i386: - <<: *branch_exceptions - <<: *prerequisites - stage: primary - image: i386/debian:stable - services: - - mariadb:10 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc-8 mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./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 +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:gcc-8_i386: <<: *branch_exceptions <<: *prerequisites stage: primary - image: i386/debian:stable + image: i386/debian:stretch services: - mariadb:10 variables: @@ -579,13 +317,13 @@ re:gcc-8_i386: SQLHOST: mariadb script: - ./tools/ci/travis.sh build CC=gcc-8 --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST zero-2018:gcc-8_i386: <<: *branch_exceptions <<: *prerequisites stage: clients - image: i386/debian:stable + image: i386/debian:stretch services: - mariadb:10 variables: @@ -594,22 +332,7 @@ zero-2018:gcc-8_i386: SQLHOST: mariadb script: - ./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-8_sanitize: - <<: *branch_exceptions - <<: *prerequisites - stage: secondary - image: debian:stable - services: - - mariadb:10 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc-8 mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./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 +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:gcc-8_sanitize: <<: *branch_exceptions @@ -624,7 +347,7 @@ re:gcc-8_sanitize: SQLHOST: mariadb script: - ./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 +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST zero-2018:gcc-8_sanitize: <<: *branch_exceptions @@ -639,28 +362,13 @@ zero-2018:gcc-8_sanitize: SQLHOST: mariadb script: - ./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-8_i386_sanitize: - <<: *branch_exceptions - <<: *prerequisites - stage: secondary - image: i386/debian:stable - services: - - mariadb:10 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc-8 mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./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 +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:gcc-8_i386_sanitize: <<: *branch_exceptions <<: *prerequisites stage: secondary - image: i386/debian:stable + image: i386/debian:stretch services: - mariadb:10 variables: @@ -669,13 +377,13 @@ re:gcc-8_i386_sanitize: SQLHOST: mariadb script: - ./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 +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST zero-2018:gcc-8_i386_sanitize: <<: *branch_exceptions <<: *prerequisites stage: clients - image: i386/debian:stable + image: i386/debian:stretch services: - mariadb:10 variables: @@ -684,29 +392,7 @@ zero-2018:gcc-8_i386_sanitize: SQLHOST: mariadb script: - ./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-8_cov: - <<: *branch_exceptions - <<: *prerequisites - stage: secondary - image: debian:buster - services: - - mariadb:10 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc-8 gcovr mariadb-client libmariadbclient-dev-compat - SQLHOST: mariadb - script: - - ./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-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 +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:gcc-8_cov: <<: *branch_exceptions @@ -721,32 +407,17 @@ re:gcc-8_cov: SQLHOST: mariadb script: - ./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-8 -o gcov_re.txt - - gcovr -r . --gcov-executable=gcov-8 --html -o gcov_re.html - - cat gcov_re.txt - artifacts: - paths: - - gcov_re.* - when: on_success +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - 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: +# - gcov_re.* +# when: on_success # Distributions -pre_re:debian-oldstable: - <<: *branch_exceptions - <<: *prerequisites - stage: platforms - image: debian:oldstable - services: - - mariadb:10.1 - variables: - <<: *base_vars - 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 - re:debian-oldstable: <<: *branch_exceptions <<: *prerequisites @@ -760,22 +431,7 @@ re:debian-oldstable: 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:debian-stable: - <<: *branch_exceptions - <<: *prerequisites - stage: platforms - image: debian:stable - services: - - mariadb:10.3 - variables: - <<: *base_vars - 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 +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:debian-stable: <<: *branch_exceptions @@ -790,22 +446,7 @@ re:debian-stable: 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:debian-testing: - <<: *branch_exceptions - <<: *prerequisites - stage: platforms - image: debian:testing - services: - - mariadb:10.3 - variables: - <<: *base_vars - 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 +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:debian-testing: <<: *branch_exceptions @@ -820,104 +461,6 @@ re:debian-testing: 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:centos-previous: - <<: *branch_exceptions - stage: platforms - image: centos:7 - services: - - mariadb:5.5 - variables: - <<: *base_vars - SQLHOST: mariadb - before_script: - - echo "Building $CI_BUILD_NAME" - - uname -a - - yum -y update - - yum install -y gcc make mariadb-devel pcre-devel git zlib-devel mariadb - - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST - - ./tools/ci/travis.sh getplugins || true - script: - - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -re:centos-previous: - <<: *branch_exceptions - stage: platforms - image: centos:7 - services: - - mariadb:5.5 - variables: - <<: *base_vars - SQLHOST: mariadb - before_script: - - echo "Building $CI_BUILD_NAME" - - uname -a - - yum -y update - - yum install -y gcc make mariadb-devel pcre-devel git zlib-devel mariadb - - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST - - ./tools/ci/travis.sh getplugins || true - script: - - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:centos-current: - <<: *branch_exceptions - stage: platforms - image: centos:8 - services: - - mariadb:10.3 - variables: - <<: *base_vars - SQLHOST: mariadb - before_script: - - echo "Building $CI_BUILD_NAME" - - uname -a - - yum -y update - - yum install -y gcc make mariadb-devel pcre-devel git zlib-devel mariadb python2 - - alternatives --set python /usr/bin/python2 - - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST - - ./tools/ci/travis.sh getplugins || true - script: - - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -re:centos-current: - <<: *branch_exceptions - stage: platforms - image: centos:8 - services: - - mariadb:10.3 - variables: - <<: *base_vars - SQLHOST: mariadb - before_script: - - echo "Building $CI_BUILD_NAME" - - uname -a - - yum -y update - - yum install -y gcc make mariadb-devel pcre-devel git zlib-devel mariadb python2 - - alternatives --set python /usr/bin/python2 - - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST - - ./tools/ci/travis.sh getplugins || true - script: - - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:ubuntu-xenial: - <<: *branch_exceptions - <<: *prerequisites - stage: platforms - image: ubuntu:16.04 - services: - - mysql:5.7 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc mysql-client libmysqlclient-dev - SQLHOST: mysql - script: - - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:ubuntu-xenial: <<: *branch_exceptions @@ -932,7 +475,7 @@ re:ubuntu-xenial: SQLHOST: mysql script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST pre_re:ubuntu-bionic: <<: *branch_exceptions @@ -947,7 +490,7 @@ pre_re:ubuntu-bionic: SQLHOST: mysql script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:ubuntu-bionic: <<: *branch_exceptions @@ -962,25 +505,10 @@ re:ubuntu-bionic: SQLHOST: mysql script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST # SQL servers -pre_re:mysql-5.5: - <<: *branch_exceptions - <<: *prerequisites - stage: platforms - image: debian:jessie - services: - - mysql:5.5 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc mysql-client-5.5 libmysqlclient-dev - SQLHOST: mysql - script: - - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - re:mysql-5.5: <<: *branch_exceptions <<: *prerequisites @@ -994,22 +522,7 @@ re:mysql-5.5: SQLHOST: mysql script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:mysql-5.6: - <<: *branch_exceptions - <<: *prerequisites - stage: platforms - image: debian:unstable - services: - - mysql:5.6 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc mysql-client libmysqlclient-dev - SQLHOST: mysql - script: - - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:mysql-5.6: <<: *branch_exceptions @@ -1024,22 +537,7 @@ re:mysql-5.6: SQLHOST: mysql script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:mysql-5.7: - <<: *branch_exceptions - <<: *prerequisites - stage: platforms - image: debian:unstable - services: - - mysql:5.7 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc mysql-client-5.7 libmysqlclient-dev - SQLHOST: mysql - script: - - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:mysql-5.7: <<: *branch_exceptions @@ -1054,22 +552,7 @@ re:mysql-5.7: SQLHOST: mysql script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -pre_re:mariadb-10.0: - <<: *branch_exceptions - <<: *prerequisites - stage: platforms - image: debian:jessie - services: - - mariadb:10.0 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc mariadb-client-10.0 libmysqlclient-dev - 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 +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:mariadb-10.0: <<: *branch_exceptions @@ -1084,22 +567,7 @@ re:mariadb-10.0: 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-10.1: - <<: *branch_exceptions - <<: *prerequisites - stage: platforms - image: debian:stretch - services: - - mariadb:10.1 - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc mariadb-client-10.1 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 +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:mariadb-10.1: <<: *branch_exceptions @@ -1116,21 +584,6 @@ 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 @@ -1144,22 +597,7 @@ re:mariadb-10.3: 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 - stage: platforms - image: debian:unstable - services: - - mariadb:latest - variables: - <<: *base_vars - 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 +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:mariadb-latest: <<: *branch_exceptions @@ -1174,22 +612,7 @@ re:mariadb-latest: 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:percona: - <<: *branch_exceptions - <<: *prerequisites - stage: platforms - image: debian:stretch - services: - - percona:latest - variables: - <<: *base_vars - INSTALL_PACKAGES: gcc mariadb-client libmariadbclient-dev-compat - SQLHOST: percona - script: - - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST re:percona: <<: *branch_exceptions @@ -1204,29 +627,4 @@ re:percona: SQLHOST: percona script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot - - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST - -# Documentation -pages: - only: - - master - stage: extras - image: debian:unstable - before_script: - - echo "Building $CI_BUILD_NAME" - - uname -a - - ./tools/ci/retry.sh apt-get update - - ./tools/ci/retry.sh apt-get install -y -qq gcc $DEBIAN_COMMON_PACKAGES libmysqlclient-dev doxygen graphviz - script: - - ./configure - - make docs - - mkdir public - - mv tools/doxygen/docs/html public/docs - - mv gcov_*.* public/ - - cp tools/doxygen/pages_index.html public/index.html - dependencies: - - re:gcc-8_cov - - pre_re:gcc-8_cov - artifacts: - paths: - - public +# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST diff --git a/tools/ci/travis.sh b/tools/ci/travis.sh index a1a3c7700..5222f0f12 100755 --- a/tools/ci/travis.sh +++ b/tools/ci/travis.sh @@ -167,6 +167,7 @@ case "$MODE" in ;; build) (cd tools && ./validateinterfaces.py silent) || aborterror "Interface validation error." + autoreconf ./configure $@ || (cat config.log && aborterror "Configure error, aborting build.") make -j3 || aborterror "Build failed." make plugins -j3 || aborterror "Build failed." -- cgit v1.2.3-60-g2f50