summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2018-11-15 04:11:11 +0100
committerGitHub <noreply@github.com>2018-11-15 04:11:11 +0100
commit1db2ef52d603e9944a912fcf350706a7a44202c9 (patch)
tree02d1af97204d169a9d598032bdb66ac0f23faa7a
parent8df29ed9c26a999eed468206e7f7c6132758f234 (diff)
parentad6b07d6ba126b57740a7b5683845a5c787b43f4 (diff)
downloadhercules-1db2ef52d603e9944a912fcf350706a7a44202c9.tar.gz
hercules-1db2ef52d603e9944a912fcf350706a7a44202c9.tar.bz2
hercules-1db2ef52d603e9944a912fcf350706a7a44202c9.tar.xz
hercules-1db2ef52d603e9944a912fcf350706a7a44202c9.zip
Merge pull request #2323 from MishimaHaruna/gitlab-ci-fix
Fix clang-4.0 builds in gitlab-ci
-rw-r--r--.gitlab-ci.yml12
1 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fb038ea66..ad4a20bf8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,9 +81,9 @@ pre_re:clang-4.0:
<<: *branch_exceptions
<<: *prerequisites
stage: secondary
- image: debian:unstable
+ image: debian:stretch
services:
- - mariadb:10
+ - mariadb:10.1
variables:
<<: *base_vars
INSTALL_PACKAGES: clang-4.0 mariadb-client libmariadbclient-dev-compat
@@ -96,9 +96,9 @@ re:clang-4.0:
<<: *branch_exceptions
<<: *prerequisites
stage: secondary
- image: debian:unstable
+ image: debian:stretch
services:
- - mariadb:10
+ - mariadb:10.1
variables:
<<: *base_vars
INSTALL_PACKAGES: clang-4.0 mariadb-client libmariadbclient-dev-compat
@@ -111,9 +111,9 @@ zero-2018:clang-4.0:
<<: *branch_exceptions
<<: *prerequisites
stage: clients
- image: debian:unstable
+ image: debian:stretch
services:
- - mariadb:10
+ - mariadb:10.1
variables:
<<: *base_vars
INSTALL_PACKAGES: clang-4.0 mariadb-client libmariadbclient-dev-compat