summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-10-12 23:03:49 +0300
committerAndrei Karas <akaras@inbox.ru>2017-10-12 23:03:49 +0300
commita85ac6e89f407cc94ee4519020175cb746ae88bb (patch)
tree69d1bac9f4a89538787dabed60f6e64ab432c84f
parentd7c17cf610eb5c5e3d2bf6f181ad9928ee3bde48 (diff)
downloadmanaverse-a85ac6e89f407cc94ee4519020175cb746ae88bb.tar.gz
manaverse-a85ac6e89f407cc94ee4519020175cb746ae88bb.tar.bz2
manaverse-a85ac6e89f407cc94ee4519020175cb746ae88bb.tar.xz
manaverse-a85ac6e89f407cc94ee4519020175cb746ae88bb.zip
Add missing package install.
-rw-r--r--.gitlab-ci.yml7
-rwxr-xr-xtools/ci/scripts/clonesrc.sh2
2 files changed, 5 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d73d1776b..4a6eb322a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,7 +54,7 @@ gcc-7_tests_gcov:
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
- valgrind
+ git-core valgrind
tags:
- docker
@@ -69,7 +69,7 @@ gcc-7_sdl2_tests_gcov:
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
- valgrind
+ git-core valgrind
tags:
- docker
@@ -87,6 +87,7 @@ doxygen:
PACKAGES: doxygen graphviz
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-core
tags:
- docker
@@ -102,7 +103,7 @@ gitstats:
dependencies: []
variables:
GIT_DEPTH: "100000"
- PACKAGES: python zlib1g git-core gnuplot
+ PACKAGES: git-core python zlib1g git-core gnuplot
tags:
- docker
diff --git a/tools/ci/scripts/clonesrc.sh b/tools/ci/scripts/clonesrc.sh
index bf25e0ed4..6c033b677 100755
--- a/tools/ci/scripts/clonesrc.sh
+++ b/tools/ci/scripts/clonesrc.sh
@@ -1,5 +1,5 @@
#!/bin/bash
rm -rf manaplus || true
-./tools/ci/scripts/retry.sh "git clone --branch master --depth 1 https://gitlab.com/manaplus/manaplus.git manaplus" || exit 1
+./tools/ci/scripts/retry.sh "git clone --branch master --depth ${GIT_DEPTH} https://gitlab.com/manaplus/manaplus.git manaplus" || exit 1
mkdir manaplus/logs || exit 1