summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-10-04 16:52:00 +0300
committerAndrei Karas <akaras@inbox.ru>2018-02-22 21:36:06 +0300
commit001ce761c597324c0e97611b0e6aeb8918a1d6ba (patch)
tree30d85e9db5f9e7d679e505b0b270df89b740fe1d
parent47b8c23ed2b01bdbb1c4d889b8cddc0aa2aa0b8f (diff)
downloadhercules-001ce761c597324c0e97611b0e6aeb8918a1d6ba.tar.gz
hercules-001ce761c597324c0e97611b0e6aeb8918a1d6ba.tar.bz2
hercules-001ce761c597324c0e97611b0e6aeb8918a1d6ba.tar.xz
hercules-001ce761c597324c0e97611b0e6aeb8918a1d6ba.zip
Remove useless parts from .gitlab-ci.yml
-rw-r--r--.gitlab-ci.yml506
-rwxr-xr-xtools/ci/travis.sh1
2 files changed, 62 insertions, 445 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d5599253f..901935b88 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ stages:
- primary
- secondary
- platforms
- - extras
+# - extras
variables: &base_vars
# Configure mysql service (https://hub.docker.com/_/mysql/)
@@ -11,7 +11,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:
@@ -19,8 +19,8 @@ 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 mysql
- - ./tools/ci/travis.sh getplugins || true
+# - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok mysql
+# - ./tools/ci/travis.sh getplugins || true
services:
- mysql:latest
@@ -33,18 +33,6 @@ variables: &base_vars
# Compilers
-pre_re:clang-3.9:
- <<: *branch_exceptions
- <<: *prerequisites
- stage: primary
- image: debian:stretch
- variables:
- <<: *base_vars
- INSTALL_PACKAGES: clang-3.9 mariadb-client libmariadbclient-dev-compat
- 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 mysql
-
re:clang-3.9:
<<: *branch_exceptions
<<: *prerequisites
@@ -55,19 +43,7 @@ re:clang-3.9:
INSTALL_PACKAGES: clang-3.9 mariadb-client libmariadbclient-dev-compat
script:
- ./tools/ci/travis.sh build CC=clang-3.9 --enable-debug --enable-Werror --enable-buildbot
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
-
-pre_re:clang-4.0:
- <<: *branch_exceptions
- <<: *prerequisites
- stage: primary
- image: debian:unstable
- variables:
- <<: *base_vars
- INSTALL_PACKAGES: clang-4.0 mysql-client libmysqlclient-dev
- 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 mysql
+# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
re:clang-4.0:
<<: *branch_exceptions
@@ -79,19 +55,7 @@ re:clang-4.0:
INSTALL_PACKAGES: clang-4.0 mysql-client libmysqlclient-dev
script:
- ./tools/ci/travis.sh build CC=clang-4.0 --enable-debug --enable-Werror --enable-buildbot
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
-
-pre_re:gcc-4.6:
- <<: *branch_exceptions
- <<: *prerequisites
- stage: secondary
- image: debian:wheezy
- variables:
- <<: *base_vars
- INSTALL_PACKAGES: gcc-4.6 mysql-client libmysqlclient-dev
- script:
- - ./tools/ci/travis.sh build CC=gcc-4.6 --enable-debug --enable-Werror --enable-buildbot --disable-renewal
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
+# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
re:gcc-4.6:
<<: *branch_exceptions
@@ -103,19 +67,7 @@ re:gcc-4.6:
INSTALL_PACKAGES: gcc-4.6 mysql-client libmysqlclient-dev
script:
- ./tools/ci/travis.sh build CC=gcc-4.6 --enable-debug --enable-Werror --enable-buildbot
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
-
-pre_re:gcc-4.7:
- <<: *branch_exceptions
- <<: *prerequisites
- stage: secondary
- image: debian:wheezy
- variables:
- <<: *base_vars
- INSTALL_PACKAGES: gcc-4.7 mysql-client libmysqlclient-dev
- script:
- - ./tools/ci/travis.sh build CC=gcc-4.7 --enable-debug --enable-Werror --enable-buildbot --disable-renewal
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
+# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
re:gcc-4.7:
<<: *branch_exceptions
@@ -127,19 +79,7 @@ re:gcc-4.7:
INSTALL_PACKAGES: gcc-4.7 mysql-client libmysqlclient-dev
script:
- ./tools/ci/travis.sh build CC=gcc-4.7 --enable-debug --enable-Werror --enable-buildbot
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
-
-pre_re:gcc-4.8:
- <<: *branch_exceptions
- <<: *prerequisites
- stage: primary
- image: debian:jessie
- variables:
- <<: *base_vars
- INSTALL_PACKAGES: gcc-4.8 mysql-client libmysqlclient-dev
- 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 mysql
+# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
re:gcc-4.8:
<<: *branch_exceptions
@@ -151,19 +91,7 @@ re:gcc-4.8:
INSTALL_PACKAGES: gcc-4.8 mysql-client libmysqlclient-dev
script:
- ./tools/ci/travis.sh build CC=gcc-4.8 --enable-debug --enable-Werror --enable-buildbot
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
-
-pre_re:gcc-4.9:
- <<: *branch_exceptions
- <<: *prerequisites
- stage: primary
- image: debian:jessie
- variables:
- <<: *base_vars
- INSTALL_PACKAGES: gcc-4.9 mysql-client libmysqlclient-dev
- 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 mysql
+# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
re:gcc-4.9:
<<: *branch_exceptions
@@ -175,19 +103,7 @@ re:gcc-4.9:
INSTALL_PACKAGES: gcc-4.9 mysql-client libmysqlclient-dev
script:
- ./tools/ci/travis.sh build CC=gcc-4.9 --enable-debug --enable-Werror --enable-buildbot
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
-
-pre_re:gcc-5:
- <<: *branch_exceptions
- <<: *prerequisites
- stage: secondary
- image: debian:unstable
- variables:
- <<: *base_vars
- INSTALL_PACKAGES: gcc-5 mysql-client libmysqlclient-dev
- script:
- - ./tools/ci/travis.sh build CC=gcc-5 --enable-debug --enable-Werror --enable-buildbot --disable-renewal
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
+# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
re:gcc-5:
<<: *branch_exceptions
@@ -199,19 +115,7 @@ re:gcc-5:
INSTALL_PACKAGES: gcc-5 mysql-client libmysqlclient-dev
script:
- ./tools/ci/travis.sh build CC=gcc-5 --enable-debug --enable-Werror --enable-buildbot
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
-
-pre_re:gcc-6:
- <<: *branch_exceptions
- <<: *prerequisites
- stage: primary
- image: debian:stretch
- variables:
- <<: *base_vars
- INSTALL_PACKAGES: gcc-6 mariadb-client libmariadbclient-dev-compat
- 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 mysql
+# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
re:gcc-6:
<<: *branch_exceptions
@@ -223,19 +127,7 @@ re:gcc-6:
INSTALL_PACKAGES: gcc-6 mariadb-client libmariadbclient-dev-compat
script:
- ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
-
-pre_re:gcc-6_i386:
- <<: *branch_exceptions
- <<: *prerequisites
- stage: primary
- image: vicamo/debian:sid-i386
- variables:
- <<: *base_vars
- INSTALL_PACKAGES: gcc-6 mysql-client libmysqlclient-dev
- 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 mysql
+# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
re:gcc-6_i386:
<<: *branch_exceptions
@@ -247,19 +139,7 @@ re:gcc-6_i386:
INSTALL_PACKAGES: gcc-6 mysql-client libmysqlclient-dev
script:
- ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
-
-pre_re:gcc-6_sanitize:
- <<: *branch_exceptions
- <<: *prerequisites
- stage: secondary
- image: debian:stretch
- variables:
- <<: *base_vars
- INSTALL_PACKAGES: gcc-6 mariadb-client libmariadbclient-dev-compat
- 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 test ragnarok ragnarok ragnarok mysql
+# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
re:gcc-6_sanitize:
<<: *branch_exceptions
@@ -271,19 +151,7 @@ re:gcc-6_sanitize:
INSTALL_PACKAGES: gcc-6 mariadb-client libmariadbclient-dev-compat
script:
- ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-manager --enable-sanitize=full
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
-
-pre_re:gcc-6_i386_sanitize:
- <<: *branch_exceptions
- <<: *prerequisites
- stage: secondary
- image: vicamo/debian:sid-i386
- variables:
- <<: *base_vars
- INSTALL_PACKAGES: gcc-6 mysql-client libmysqlclient-dev
- 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 test ragnarok ragnarok ragnarok mysql
+# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
re:gcc-6_i386_sanitize:
<<: *branch_exceptions
@@ -295,26 +163,7 @@ re:gcc-6_i386_sanitize:
INSTALL_PACKAGES: gcc-6 mysql-client libmysqlclient-dev
script:
- ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-manager --enable-sanitize=full
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
-
-pre_re:gcc-6_cov:
- <<: *branch_exceptions
- <<: *prerequisites
- stage: secondary
- image: debian:stretch
- variables:
- <<: *base_vars
- INSTALL_PACKAGES: gcc-6 gcovr mariadb-client libmariadbclient-dev-compat
- 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 test ragnarok ragnarok ragnarok mysql
- - gcovr -r . --gcov-executable=gcov-6 -o gcov_pre.txt
- - gcovr -r . --gcov-executable=gcov-6 --html -o gcov_pre.html
- - cat gcov_pre.txt
- artifacts:
- paths:
- - gcov_pre.*
- when: on_success
+# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
re:gcc-6_cov:
<<: *branch_exceptions
@@ -326,29 +175,17 @@ re:gcc-6_cov:
INSTALL_PACKAGES: gcc-6 gcovr mariadb-client libmariadbclient-dev-compat
script:
- ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot CFLAGS="-coverage" LDFLAGS="-coverage"
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
- - gcovr -r . --gcov-executable=gcov-6 -o gcov_re.txt
- - gcovr -r . --gcov-executable=gcov-6 --html -o gcov_re.html
- - cat gcov_re.txt
- artifacts:
- paths:
- - gcov_re.*
- when: on_success
+# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
+# - gcovr -r . --gcov-executable=gcov-6 -o gcov_re.txt
+# - gcovr -r . --gcov-executable=gcov-6 --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
- variables:
- <<: *base_vars
- INSTALL_PACKAGES: gcc mysql-client libmysqlclient-dev
- script:
- - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
-
re:debian-oldstable:
<<: *branch_exceptions
<<: *prerequisites
@@ -359,19 +196,7 @@ re:debian-oldstable:
INSTALL_PACKAGES: gcc mysql-client libmysqlclient-dev
script:
- ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
-
-pre_re:debian-stable:
- <<: *branch_exceptions
- <<: *prerequisites
- stage: platforms
- image: debian:stable
- variables:
- <<: *base_vars
- INSTALL_PACKAGES: gcc mariadb-client libmariadbclient-dev-compat
- script:
- - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
+# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
re:debian-stable:
<<: *branch_exceptions
@@ -383,19 +208,7 @@ re:debian-stable:
INSTALL_PACKAGES: gcc mariadb-client libmariadbclient-dev-compat
script:
- ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
-
-pre_re:debian-testing:
- <<: *branch_exceptions
- <<: *prerequisites
- stage: platforms
- image: debian:testing
- variables:
- <<: *base_vars
- INSTALL_PACKAGES: gcc mariadb-client libmariadbclient-dev-compat
- script:
- - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
+# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
re:debian-testing:
<<: *branch_exceptions
@@ -407,101 +220,7 @@ re:debian-testing:
INSTALL_PACKAGES: gcc mariadb-client libmariadbclient-dev-compat
script:
- ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
-
-pre_re:centos-previous:
- <<: *branch_exceptions
- stage: platforms
- image: centos:6
- before_script:
- - echo "Building $CI_BUILD_NAME"
- - uname -a
- - yum -y update
- - yum install -y make mysql-devel pcre-devel git zlib-devel mysql
- - yum install -y centos-release-scl
- - yum install -y yum install devtoolset-3-toolchain
- - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok mysql
- - ./tools/ci/travis.sh getplugins || true
- services:
- - mysql:latest
- variables:
- <<: *base_vars
- script:
- - scl enable devtoolset-3 './tools/ci/travis.sh build CFLAGS="-Wno-cast-qual" --enable-debug --enable-Werror --enable-buildbot --disable-renewal'
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
-
-re:centos-previous:
- <<: *branch_exceptions
- stage: platforms
- image: centos:6
- before_script:
- - echo "Building $CI_BUILD_NAME"
- - uname -a
- - yum -y update
- - yum install -y make mysql-devel pcre-devel git zlib-devel mysql
- - yum install -y centos-release-scl
- - yum install -y yum install devtoolset-3-toolchain
- - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok mysql
- - ./tools/ci/travis.sh getplugins || true
- services:
- - mysql:latest
- variables:
- <<: *base_vars
- script:
- - scl enable devtoolset-3 './tools/ci/travis.sh build CFLAGS="-Wno-cast-qual" --enable-debug --enable-Werror --enable-buildbot'
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
-
-pre_re:centos-current:
- <<: *branch_exceptions
- stage: platforms
- image: centos:7
- before_script:
- - echo "Building $CI_BUILD_NAME"
- - uname -a
- - yum -y update
- - yum install -y gcc make mysql-devel pcre-devel git zlib-devel mysql
- - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok mysql
- - ./tools/ci/travis.sh getplugins || true
- services:
- - mysql:latest
- variables:
- <<: *base_vars
- script:
- - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
-
-re:centos-current:
- <<: *branch_exceptions
- stage: platforms
- image: centos:7
- before_script:
- - echo "Building $CI_BUILD_NAME"
- - uname -a
- - yum -y update
- - yum install -y gcc make mysql-devel pcre-devel git zlib-devel mysql
- - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok mysql
- - ./tools/ci/travis.sh getplugins || true
- services:
- - mysql:latest
- variables:
- <<: *base_vars
- script:
- - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
-
-pre_re:ubuntu-xenial:
- <<: *branch_exceptions
- <<: *prerequisites
- stage: platforms
- image: ubuntu:16.04
- services:
- - mysql:latest
- variables:
- <<: *base_vars
- INSTALL_PACKAGES: gcc mysql-client libmysqlclient-dev
- script:
- - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
+# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
re:ubuntu-xenial:
<<: *branch_exceptions
@@ -515,24 +234,10 @@ re:ubuntu-xenial:
INSTALL_PACKAGES: gcc mysql-client libmysqlclient-dev
script:
- ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
+# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
# SQL servers
-pre_re:mysql-5.5:
- <<: *branch_exceptions
- <<: *prerequisites
- stage: platforms
- image: debian:jessie
- variables:
- <<: *base_vars
- INSTALL_PACKAGES: gcc mysql-client-5.5 libmysqlclient-dev
- services:
- - mysql:5.5
- script:
- - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
-
re:mysql-5.5:
<<: *branch_exceptions
<<: *prerequisites
@@ -545,21 +250,7 @@ re:mysql-5.5:
- mysql:5.5
script:
- ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
-
-pre_re:mysql-5.6:
- <<: *branch_exceptions
- <<: *prerequisites
- stage: platforms
- image: debian:jessie
- variables:
- <<: *base_vars
- INSTALL_PACKAGES: gcc mysql-client libmysqlclient-dev
- services:
- - mysql:5.6
- script:
- - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
+# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
re:mysql-5.6:
<<: *branch_exceptions
@@ -573,21 +264,7 @@ re:mysql-5.6:
- mysql:5.6
script:
- ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
-
-pre_re:mysql-5.7:
- <<: *branch_exceptions
- <<: *prerequisites
- stage: platforms
- image: debian:unstable
- variables:
- <<: *base_vars
- INSTALL_PACKAGES: gcc mysql-client-5.7 libmysqlclient-dev
- services:
- - mysql:5.7
- script:
- - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
+# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
re:mysql-5.7:
<<: *branch_exceptions
@@ -601,27 +278,7 @@ re:mysql-5.7:
- mysql:5.7
script:
- ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
-
-pre_re:mariadb-10.0:
- <<: *branch_exceptions
- stage: platforms
- image: debian:jessie
- variables:
- <<: *base_vars
- INSTALL_PACKAGES: gcc mariadb-client-10.0 libmysqlclient-dev
- 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 $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES
- - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok mariadb
- - ./tools/ci/travis.sh getplugins || true
- services:
- - mariadb:10.0
- script:
- - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mariadb
+# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql
re:mariadb-10.0:
<<: *branch_exceptions
@@ -635,33 +292,13 @@ re:mariadb-10.0:
- 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 mariadb
- - ./tools/ci/travis.sh getplugins || true
+# - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok mariadb
+# - ./tools/ci/travis.sh getplugins || true
services:
- mariadb:10.0
script:
- ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mariadb
-
-pre_re:mariadb-latest:
- <<: *branch_exceptions
- stage: platforms
- image: debian:unstable
- variables:
- <<: *base_vars
- INSTALL_PACKAGES: gcc mariadb-client-10.1 libmariadbclient-dev-compat
- 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 $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES
- - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok mariadb
- - ./tools/ci/travis.sh getplugins || true
- services:
- - mariadb:latest
- script:
- - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mariadb
+# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mariadb
re:mariadb-latest:
<<: *branch_exceptions
@@ -675,33 +312,13 @@ re:mariadb-latest:
- 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 mariadb
- - ./tools/ci/travis.sh getplugins || true
+# - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok mariadb
+# - ./tools/ci/travis.sh getplugins || true
services:
- mariadb:latest
script:
- ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mariadb
-
-pre_re:percona:
- <<: *branch_exceptions
- stage: platforms
- image: debian:jessie
- variables:
- <<: *base_vars
- INSTALL_PACKAGES: gcc mysql-client libmysqlclient-dev
- 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 $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES
- - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok percona
- - ./tools/ci/travis.sh getplugins || true
- services:
- - percona:latest
- script:
- - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok percona
+# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mariadb
re:percona:
<<: *branch_exceptions
@@ -715,35 +332,34 @@ re:percona:
- 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 percona
- - ./tools/ci/travis.sh getplugins || true
+# - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok percona
+# - ./tools/ci/travis.sh getplugins || true
services:
- percona:latest
script:
- ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot
- - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok percona
+# - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok percona
# 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-6_cov
- - pre_re:gcc-6_cov
- artifacts:
- paths:
- - public
+#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-6_cov
+# artifacts:
+# paths:
+# - public
diff --git a/tools/ci/travis.sh b/tools/ci/travis.sh
index f6c799934..7e524c887 100755
--- a/tools/ci/travis.sh
+++ b/tools/ci/travis.sh
@@ -144,6 +144,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."