diff options
author | Haru <haru@dotalux.com> | 2017-02-26 16:35:03 +0100 |
---|---|---|
committer | Haru <haru@dotalux.com> | 2017-02-26 16:39:00 +0100 |
commit | 9fba7e8c5966bb0aa5ce1c31ebe5cec96180e1d5 (patch) | |
tree | 94af31f9e70095349400cf08947e622b2e7d5441 /.gitlab-ci.yml | |
parent | af4fbc19e20a02e515af9fa2d4a249e30edb8d4f (diff) | |
download | hercules-9fba7e8c5966bb0aa5ce1c31ebe5cec96180e1d5.tar.gz hercules-9fba7e8c5966bb0aa5ce1c31ebe5cec96180e1d5.tar.bz2 hercules-9fba7e8c5966bb0aa5ce1c31ebe5cec96180e1d5.tar.xz hercules-9fba7e8c5966bb0aa5ce1c31ebe5cec96180e1d5.zip |
Fix a CI build failure (gcc-5)
- Debian Stretch no longer offers gcc-5. Those builds have now been
switched to Sid, which still offers it.
- The gcc-5 builds have been moved fromthe primary to the secondary
pipeline stage.
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 13d140fbc..8a3eb53c5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -180,11 +180,11 @@ re:gcc-4.9: pre_re:gcc-5: <<: *branch_exceptions <<: *prerequisites - stage: primary - image: debian:stretch + stage: secondary + image: debian:unstable variables: <<: *base_vars - INSTALL_PACKAGES: gcc-5 mariadb-client libmariadbclient-dev-compat + 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 @@ -192,11 +192,11 @@ pre_re:gcc-5: re:gcc-5: <<: *branch_exceptions <<: *prerequisites - stage: primary - image: debian:stretch + stage: secondary + image: debian:unstable variables: <<: *base_vars - INSTALL_PACKAGES: gcc-5 mariadb-client libmariadbclient-dev-compat + 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 |