diff options
| author | Andrei Karas <akaras@inbox.ru> | 2018-07-10 23:49:41 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2018-07-10 23:49:41 +0300 |
| commit | ab4e8f337e4f7c1e1063382038cfa6c86670b772 (patch) | |
| tree | 306067aab0c382b9b8d37011eff3b141b677c541 /tools/ci/branches/ci_gcc7_tests | |
| parent | e2301db04dddcf2fbebd9e1866cb7d1e47aeb8a9 (diff) | |
| download | plus-ab4e8f337e4f7c1e1063382038cfa6c86670b772.tar.gz plus-ab4e8f337e4f7c1e1063382038cfa6c86670b772.tar.bz2 plus-ab4e8f337e4f7c1e1063382038cfa6c86670b772.tar.xz plus-ab4e8f337e4f7c1e1063382038cfa6c86670b772.zip | |
Disable valgrind in most branches. With gcc-6 replace to stable debian image.
Diffstat (limited to 'tools/ci/branches/ci_gcc7_tests')
| -rw-r--r-- | tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml index ee8b8e54d..270c206ad 100644 --- a/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml @@ -138,7 +138,7 @@ gcc-7_tests_i386: tags: - docker -gcc-7_tests: +gcc-7_tests_flags: stage: build script: - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug @@ -153,6 +153,20 @@ gcc-7_tests: tags: - docker +gcc-7_tests: + stage: build + script: + - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame + <<: *job-push + variables: + PACKAGES: gcc-7 g++-7 + 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 + git valgrind + tags: + - docker + gcc-7_sdl2_tests_i386: stage: build script: @@ -168,7 +182,7 @@ gcc-7_sdl2_tests_i386: tags: - docker -gcc-7_tests_valgrind: +.gcc-7_tests_valgrind: stage: build script: - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame || true @@ -185,7 +199,7 @@ gcc-7_tests_valgrind: tags: - docker -gcc-7_tests_valgrind_i386: +.gcc-7_tests_valgrind_i386: stage: build script: - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame || true |