summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-04-01 01:25:13 +0300
committerAndrei Karas <akaras@inbox.ru>2017-04-01 01:25:13 +0300
commit6c5e4054f534249d4a6c83c436634fc06fb31c47 (patch)
tree0101a454f69ce39dbb7b7a072c9955e1807ea793 /.gitlab-ci.yml
parent55e0c28be50b70d2b69dd805f249074b6c191ad2 (diff)
downloadmv-6c5e4054f534249d4a6c83c436634fc06fb31c47.tar.gz
mv-6c5e4054f534249d4a6c83c436634fc06fb31c47.tar.bz2
mv-6c5e4054f534249d4a6c83c436634fc06fb31c47.tar.xz
mv-6c5e4054f534249d4a6c83c436634fc06fb31c47.zip
Improve a bit speed in .gitlab-ci.yml by moving job with unit tests binary into build stage.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml15
1 files changed, 13 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4f01b7a14..7142292ab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -214,10 +214,10 @@ gcc-6_dyecmd_only:
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
-gcc-6_all_and_unittestsbin:
+gcc-6_unittestsbin:
stage: prebuild
script:
- - ./tools/ci/jobs/gcc6_silent.sh --enable-unittestsbin
+ - ./tools/ci/jobs/gcc6_silent.sh --enable-unittestsbin --without-manaplusgame --without-dyecmd
<<: *job-shared
variables:
PACKAGES: gcc-6 g++-6
@@ -1320,6 +1320,17 @@ clang-3.8_i386:
tags:
- docker
+gcc-6_all_and_unittestsbin:
+ stage: prebuild
+ script:
+ - ./tools/ci/jobs/gcc6_silent.sh --enable-unittestsbin
+ <<: *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
+
gcc-4.8_c++11:
stage: build
script: