summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2018-08-26 20:17:33 +0200
committerGitHub <noreply@github.com>2018-08-26 20:17:33 +0200
commita1e841ccf13c63fefad02a1bfce0e50b92c649a0 (patch)
treed04e9fd41d61c6bc5bb72cb97ab3701e91fee444
parent1455dab58a381479b196c73b50b42990b9aff580 (diff)
parent13d7a0c2701eb44025d61eb8971d0af989509389 (diff)
downloadhercules-a1e841ccf13c63fefad02a1bfce0e50b92c649a0.tar.gz
hercules-a1e841ccf13c63fefad02a1bfce0e50b92c649a0.tar.bz2
hercules-a1e841ccf13c63fefad02a1bfce0e50b92c649a0.tar.xz
hercules-a1e841ccf13c63fefad02a1bfce0e50b92c649a0.zip
Merge pull request #2191 from MishimaHaruna/fix-ci-centos
Fix CentOS builds in gitlab-ci
-rw-r--r--.gitlab-ci.yml14
1 files changed, 6 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e98922276..d9a156298 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -901,13 +901,12 @@ pre_re:centos-previous:
- 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
+ - yum install -y make mysql-devel pcre-devel git zlib-devel mysql centos-release-scl
+ - yum install -y devtoolset-6-toolchain
- ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST
- ./tools/ci/travis.sh getplugins || true
script:
- - scl enable devtoolset-3 './tools/ci/travis.sh build CFLAGS="-Wno-cast-qual" --enable-debug --enable-Werror --enable-buildbot --disable-renewal'
+ - 'source /opt/rh/devtoolset-6/enable && ./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:
@@ -923,13 +922,12 @@ re:centos-previous:
- 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
+ - yum install -y make mysql-devel pcre-devel git zlib-devel mysql centos-release-scl
+ - yum install -y devtoolset-6-toolchain
- ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok $SQLHOST
- ./tools/ci/travis.sh getplugins || true
script:
- - scl enable devtoolset-3 './tools/ci/travis.sh build CFLAGS="-Wno-cast-qual" --enable-debug --enable-Werror --enable-buildbot'
+ - 'source /opt/rh/devtoolset-6/enable && ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot'
- ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
pre_re:centos-current: