summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-01 18:39:07 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-01 18:39:07 +0300
commit2536d6b5dad704b658dd6687818c11acbcd96b87 (patch)
treeca343096ecbb88d8fc47e5e2434ea7151e51ecba
parent89138f2fbeec54fa8062bdc37a9ec630afbb0848 (diff)
downloadplus-2536d6b5dad704b658dd6687818c11acbcd96b87.tar.gz
plus-2536d6b5dad704b658dd6687818c11acbcd96b87.tar.bz2
plus-2536d6b5dad704b658dd6687818c11acbcd96b87.tar.xz
plus-2536d6b5dad704b658dd6687818c11acbcd96b87.zip
In .gitlab-ci.yml move all linters and gcc_h_all job into prebuild stage.
-rw-r--r--.gitlab-ci.yml60
1 files changed, 30 insertions, 30 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 739fbc711..b1dc2b889 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,6 +22,36 @@ gcc-6:
- ./tools/ci/jobs/gcc6.sh
image: debian:unstable
+mplint_po:
+ stage: prebuild
+ script:
+ - ./tools/ci/jobs/mplint.sh po
+ image: debian:unstable
+
+mplint_src:
+ stage: prebuild
+ script:
+ - ./tools/ci/jobs/mplint.sh src
+ image: debian:unstable
+
+mplint_data:
+ stage: prebuild
+ script:
+ - ./tools/ci/jobs/mplint.sh data
+ image: debian:unstable
+
+cpplint:
+ stage: prebuild
+ script:
+ - ./tools/ci/jobs/cpplint.sh
+ image: debian:unstable
+
+gcc-5_h_all:
+ stage: prebuild
+ script:
+ - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DEATHENA_SUPPORT -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML
+ image: debian:unstable
+
# simple builds
gcc-4.4:
@@ -363,12 +393,6 @@ gcc-5_h_eathena_tmwa:
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DEATHENA_SUPPORT -DTMWA_SUPPORT -DENABLE_LIBXML
image: debian:unstable
-gcc-5_h_all:
- stage: test
- script:
- - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DEATHENA_SUPPORT -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML
- image: debian:unstable
-
gcc-5_h_pugi_all:
stage: test
script:
@@ -381,30 +405,6 @@ gcc-5_tarball:
- ./tools/ci/jobs/gcc5_tarball.sh
image: debian:unstable
-mplint_po:
- stage: test
- script:
- - ./tools/ci/jobs/mplint.sh po
- image: debian:unstable
-
-mplint_src:
- stage: test
- script:
- - ./tools/ci/jobs/mplint.sh src
- image: debian:unstable
-
-mplint_data:
- stage: test
- script:
- - ./tools/ci/jobs/mplint.sh data
- image: debian:unstable
-
-cpplint:
- stage: test
- script:
- - ./tools/ci/jobs/cpplint.sh
- image: debian:unstable
-
# reports
success: