summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2018-07-10 11:03:11 -0300
committerJesusaves <cpntb1@ymail.com>2018-07-10 11:03:11 -0300
commitd20603aad35023615cb7b13a71d95ba9c42c4a97 (patch)
tree3bf5b669291f0b58ccc364dd760762821de82ff7
parentb36b9271fe521bd417ef9f90969703f74860f14b (diff)
downloadserverdata-d20603aad35023615cb7b13a71d95ba9c42c4a97.tar.gz
serverdata-d20603aad35023615cb7b13a71d95ba9c42c4a97.tar.bz2
serverdata-d20603aad35023615cb7b13a71d95ba9c42c4a97.tar.xz
serverdata-d20603aad35023615cb7b13a71d95ba9c42c4a97.zip
Follow some Andrei Akaras changes on CI, to have at least a Valgrind check
-rw-r--r--.gitlab-ci.yml11
1 files changed, 5 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 528c11c4c..4999d3fa0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,6 @@
stages:
- build
- test
-- valgrind
- fail
- ok
@@ -150,7 +149,7 @@ mariadb_run_latest:
- mariadb:latest
.mysql_run_valgrind_latest:
- stage: valgrind
+ stage: test
script:
- export CC=gcc-6
- ./.tools/jobs/install.sh "mysql-client
@@ -168,7 +167,7 @@ mariadb_run_latest:
- mysql:latest
.mysql_run_valgrind_5.7:
- stage: valgrind
+ stage: test
script:
- export CC=gcc-6
- ./.tools/jobs/install.sh "mysql-client
@@ -185,15 +184,15 @@ mariadb_run_latest:
services:
- mysql:5.7
-.mariadb_run_valgrind_latest:
- stage: valgrind
+mariadb_run_valgrind_latest:
+ stage: test
script:
- export CC=gcc-6
- ./.tools/jobs/install.sh "mysql-client
gcc-6
git-core
make autoconf automake autopoint
- libtool libmysqlclient-dev libz-dev libpcre3-dev
+ libtool libmariadbclient-dev libz-dev libpcre3-dev
valgrind"
- ./.tools/jobs/cloneall.sh
- ./.tools/jobs/initdb.sh mariadb