From 64381ee8fb9913abca4c218e21d1407e92e9aad2 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 9 Jul 2018 06:11:06 +0300 Subject: Merge valgrind and test stage in .gitlab-ci.yml --- .gitlab-ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b0625e27..77d159da 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,6 @@ stages: - build - test -- valgrind - fail - ok @@ -283,7 +282,7 @@ mariadb_run_latest_gcc7: expire_in: 3 week .mysql_run_valgrind_latest: - stage: valgrind + stage: test script: - export CC=gcc-6 - ./.tools/jobs/install.sh "mysql-client @@ -305,7 +304,7 @@ mariadb_run_latest_gcc7: expire_in: 3 week mysql_run_valgrind_5.7: - stage: valgrind + stage: test script: - export CC=gcc-6 - ./.tools/jobs/install.sh "mysql-client @@ -327,7 +326,7 @@ mysql_run_valgrind_5.7: expire_in: 3 week mariadb_run_valgrind_latest: - stage: valgrind + stage: test script: - export CC=gcc-6 - ./.tools/jobs/install.sh "mysql-client -- cgit v1.2.3-70-g09d2