diff options
| author | Andrei Karas <akaras@inbox.ru> | 2018-07-09 06:11:06 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2018-07-09 07:20:45 +0300 |
| commit | 64381ee8fb9913abca4c218e21d1407e92e9aad2 (patch) | |
| tree | 5832d24e14ee22094490a18961afe5a07c8f17ae | |
| parent | 4521b56f0f125bfba4385e2fce2eb02c6c255b3b (diff) | |
| download | serverdata-s20180713.tar.gz serverdata-s20180713.tar.bz2 serverdata-s20180713.tar.xz serverdata-s20180713.zip | |
Merge valgrind and test stage in .gitlab-ci.ymls20180713
| -rw-r--r-- | .gitlab-ci.yml | 7 |
1 files 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 |