summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-03-08 23:23:20 +0300
committerAndrei Karas <akaras@inbox.ru>2017-03-08 23:23:20 +0300
commit42d2d0b36bea11b219a7587f9a2d662bdbd024c0 (patch)
tree27463eae0e612f3ea052e8d71ac2bbd438ebaac7
parent54b1d781c1d5d59211edf4314a4f043647c109bf (diff)
downloadplus-42d2d0b36bea11b219a7587f9a2d662bdbd024c0.tar.gz
plus-42d2d0b36bea11b219a7587f9a2d662bdbd024c0.tar.bz2
plus-42d2d0b36bea11b219a7587f9a2d662bdbd024c0.tar.xz
plus-42d2d0b36bea11b219a7587f9a2d662bdbd024c0.zip
Move valgrind builds into build stage in .gitlab-ci.yml
-rw-r--r--.gitlab-ci.yml74
1 files changed, 35 insertions, 39 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eef585d48..583e99d28 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,6 @@
stages:
- prebuild
- build
- - failbuild
- stats
before_script:
@@ -663,6 +662,41 @@ gcc-5_sdl2_no_opengl_tests_i386:
tags:
- docker
+gcc-6_tests_valgrind:
+ stage: build
+ script:
+ - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame || true
+ - echo test valgrind
+ - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log
+ - grep "invalid" logs/valg.log && exit 1 || true
+ <<: *job-shared
+ variables:
+ PACKAGES: gcc-6 g++-6
+ make autoconf automake autopoint gettext
+ libxml2-dev libcurl4-gnutls-dev libpng-dev
+ libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
+ valgrind
+ tags:
+ - docker
+
+gcc-6_tests_valgrind_i386:
+ stage: build
+ script:
+ - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame || true
+ - echo test valgrind
+ - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log
+ - grep "invalid" logs/valg.log && exit 1 || true
+ image: vicamo/debian:sid-i386
+ <<: *job-shared
+ variables:
+ PACKAGES: gcc-6 g++-6
+ make autoconf automake autopoint gettext
+ libxml2-dev libcurl4-gnutls-dev libpng-dev
+ libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
+ valgrind
+ tags:
+ - docker
+
gcc-6_lto:
stage: build
script:
@@ -4265,44 +4299,6 @@ gitstats:
only:
- master
-# failed build checks
-gcc-6_tests_valgrind:
- stage: failbuild
- script:
- - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame || true
- - echo test valgrind
- - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log
- - grep "invalid" logs/valg.log && exit 1 || true
- <<: *job-shared
- when: on_failure
- variables:
- PACKAGES: gcc-6 g++-6
- make autoconf automake autopoint gettext
- libxml2-dev libcurl4-gnutls-dev libpng-dev
- libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
- valgrind
- tags:
- - docker
-
-gcc-6_tests_valgrind_i386:
- stage: failbuild
- script:
- - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame || true
- - echo test valgrind
- - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log
- - grep "invalid" logs/valg.log && exit 1 || true
- image: vicamo/debian:sid-i386
- <<: *job-shared
- when: on_failure
- variables:
- PACKAGES: gcc-6 g++-6
- make autoconf automake autopoint gettext
- libxml2-dev libcurl4-gnutls-dev libpng-dev
- libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
- valgrind
- tags:
- - docker
-
# stats
pages: