diff options
| author | Haru <haru@dotalux.com> | 2018-06-29 12:12:40 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2018-06-30 05:58:37 +0200 |
| commit | 3823f6c0d8fb8f17eb095ec90ec64df2ad58cab7 (patch) | |
| tree | f8b75b874a4f722424e4ecdff3653339371e1a8d /.gitlab-ci.yml | |
| parent | 1ca2abbf98386290f44881d794ab26b8774303d3 (diff) | |
| download | hercules-3823f6c0d8fb8f17eb095ec90ec64df2ad58cab7.tar.gz hercules-3823f6c0d8fb8f17eb095ec90ec64df2ad58cab7.tar.bz2 hercules-3823f6c0d8fb8f17eb095ec90ec64df2ad58cab7.tar.xz hercules-3823f6c0d8fb8f17eb095ec90ec64df2ad58cab7.zip | |
Update gcc builds for GitLab CI
- Moved gcc-4.8 from the primary to the secondary stage
- Added gcc-7 (secondary stage)
- Added gcc-8 (secondary stage)
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 64 |
1 files changed, 62 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 392548db0..8f90c0005 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -244,7 +244,7 @@ re:gcc-4.7: pre_re:gcc-4.8: <<: *branch_exceptions <<: *prerequisites - stage: primary + stage: secondary image: debian:jessie services: - mysql:5.5 @@ -259,7 +259,7 @@ pre_re:gcc-4.8: re:gcc-4.8: <<: *branch_exceptions <<: *prerequisites - stage: primary + stage: secondary image: debian:jessie services: - mysql:5.5 @@ -361,6 +361,66 @@ re:gcc-6: - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST +pre_re:gcc-7: + <<: *branch_exceptions + <<: *prerequisites + stage: secondary + image: debian:unstable + 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 + +re:gcc-7: + <<: *branch_exceptions + <<: *prerequisites + stage: secondary + image: debian:unstable + 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 + - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST + +pre_re:gcc-8: + <<: *branch_exceptions + <<: *prerequisites + stage: secondary + image: debian:unstable + 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 + +re:gcc-8: + <<: *branch_exceptions + <<: *prerequisites + stage: secondary + image: debian:unstable + 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 + - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST + pre_re:gcc-6_i386: <<: *branch_exceptions <<: *prerequisites |