diff options
| author | Haru <haru@dotalux.com> | 2020-06-01 15:47:50 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2020-06-01 17:21:37 +0200 |
| commit | 677c78b6b73ffe0cf49eb1b435a11dc7149ebb6a (patch) | |
| tree | aaeb59cf90da1a531f47977997c13afad1b4e0e2 /.gitlab-ci.yml | |
| parent | 6a31d1e02cabf8e25cbe339a7adb076eb8a46800 (diff) | |
| download | hercules-677c78b6b73ffe0cf49eb1b435a11dc7149ebb6a.tar.gz hercules-677c78b6b73ffe0cf49eb1b435a11dc7149ebb6a.tar.bz2 hercules-677c78b6b73ffe0cf49eb1b435a11dc7149ebb6a.tar.xz hercules-677c78b6b73ffe0cf49eb1b435a11dc7149ebb6a.zip | |
Retired the (failing) CentOS 6 builds from gitlab-ci in favor of CentOS 8
CentOS 8 has been released in September 2019, so CentOS 6 is no longer a
supported platform for Hercules. Compiling on it may or may not still
work (provided that a suitable devtoolset package is available, but will
not be officially supported.
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 438dbc267..15d6112c4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -825,61 +825,60 @@ re:debian-testing: pre_re:centos-previous: <<: *branch_exceptions stage: platforms - image: centos:6 + image: centos:7 services: - - mysql:5.5 + - mariadb:5.5 variables: <<: *base_vars - SQLHOST: mysql + SQLHOST: mariadb before_script: - echo "Building $CI_BUILD_NAME" - uname -a - yum -y update - - yum install -y make mysql-devel pcre-devel git zlib-devel mysql centos-release-scl - - yum install -y devtoolset-6-toolchain + - 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: - - 'source /opt/rh/devtoolset-6/enable && ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal' + - ./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:6 + image: centos:7 services: - - mysql:5.5 + - mariadb:5.5 variables: <<: *base_vars - SQLHOST: mysql + SQLHOST: mariadb before_script: - echo "Building $CI_BUILD_NAME" - uname -a - yum -y update - - yum install -y make mysql-devel pcre-devel git zlib-devel mysql centos-release-scl - - yum install -y devtoolset-6-toolchain + - 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: - - 'source /opt/rh/devtoolset-6/enable && ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot' + - ./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:7 + image: centos:8 services: - - mariadb:5.5 + - 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 + - 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 - variables: - <<: *base_vars - 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 @@ -887,19 +886,20 @@ pre_re:centos-current: re:centos-current: <<: *branch_exceptions stage: platforms - image: centos:7 + image: centos:8 services: - - mariadb:5.5 + - 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 + - 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 - variables: - <<: *base_vars - SQLHOST: mariadb script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST |