diff options
| author | Andrei Karas <akaras@inbox.ru> | 2018-06-18 07:01:21 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2018-06-18 07:01:21 +0300 |
| commit | 74701b17fc28be2a9d293760dcb0935d4d45a006 (patch) | |
| tree | 425824b21c26e0e68f48a4e09911041049c8f818 /tools/ci | |
| parent | 9fa4b8dfdb999dd60e4b5f8fb09d08eaa26c9596 (diff) | |
| download | manaplus-74701b17fc28be2a9d293760dcb0935d4d45a006.tar.gz manaplus-74701b17fc28be2a9d293760dcb0935d4d45a006.tar.bz2 manaplus-74701b17fc28be2a9d293760dcb0935d4d45a006.tar.xz manaplus-74701b17fc28be2a9d293760dcb0935d4d45a006.zip | |
Revert "Replace gcov from pip in collecting coverage data in ci_site branch."
This reverts commit 71a64f0f6badb8a04faf0296c5e95610b097489f.
Diffstat (limited to 'tools/ci')
| -rw-r--r-- | tools/ci/branches/ci_site/.gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/ci/branches/ci_site/.gitlab-ci.yml b/tools/ci/branches/ci_site/.gitlab-ci.yml index 7aa0ce1c8..fa358cbcc 100644 --- a/tools/ci/branches/ci_site/.gitlab-ci.yml +++ b/tools/ci/branches/ci_site/.gitlab-ci.yml @@ -35,7 +35,6 @@ gcc-7_tests_gcov: stage: build script: - ./tools/ci/scripts/clonesrc.sh - - pip install gcov - cd manaplus - ./tools/ci/jobs/gcc7_tests_gcov.sh --without-dyecmd --without-manaplusgame <<: *job-push @@ -44,6 +43,7 @@ gcc-7_tests_gcov: 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 + gcovr git-core valgrind tags: - docker @@ -52,7 +52,6 @@ gcc-7_sdl2_tests_gcov: stage: build script: - ./tools/ci/scripts/clonesrc.sh - - pip install gcov - cd manaplus - ./tools/ci/jobs/gcc7_sdl2_tests_gcov.sh --without-dyecmd --without-manaplusgame <<: *job-push @@ -61,6 +60,7 @@ gcc-7_sdl2_tests_gcov: make autoconf automake autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev libsdl2-dev libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev + gcovr git-core valgrind tags: - docker |