summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-10-09 20:45:06 +0300
committerAndrei Karas <akaras@inbox.ru>2017-10-09 20:45:06 +0300
commit1f91a01f99a1f8ad84d69a19e5b55bf917c93a99 (patch)
tree9d3327929ca7f99944ef78d1ed564dddf153ea2c /.gitlab-ci.yml
parentcd6b02aed24b4f9e2899bb9b58ff84a2afe0896d (diff)
downloadmv-1f91a01f99a1f8ad84d69a19e5b55bf917c93a99.tar.gz
mv-1f91a01f99a1f8ad84d69a19e5b55bf917c93a99.tar.bz2
mv-1f91a01f99a1f8ad84d69a19e5b55bf917c93a99.tar.xz
mv-1f91a01f99a1f8ad84d69a19e5b55bf917c93a99.zip
Merge .h build files in .gitlab-ci.yml
Also remove script gcc5_h_pugi.sh
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml144
1 files changed, 63 insertions, 81 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 064869a5c..0bc8c820a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -360,6 +360,9 @@ gcc-5_h_all:
stage: prebuild
script:
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL
+ - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_LIBXML -I/usr/include/SDL
+ - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2
+ - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -I/usr/include/SDL
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5
@@ -371,6 +374,9 @@ gcc-5_h_all_i386:
stage: prebuild
script:
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL
+ - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_LIBXML -I/usr/include/SDL
+ - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2
+ - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -I/usr/include/SDL
image: vicamo/debian:sid-i386
<<: *job-push
variables:
@@ -3123,86 +3129,6 @@ gcc-5_default_i386:
tags:
- docker
-gcc-5_h_eathena_tmwa:
- stage: build
- script:
- - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_LIBXML -I/usr/include/SDL
- <<: *job-push
- variables:
- PACKAGES: gcc-5 g++-5
- 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-5_h_pugi_all:
- stage: build
- script:
- - ./tools/ci/jobs/gcc5_h_pugi.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_PUGIXML -I/usr/include/SDL
- <<: *job-push
- variables:
- PACKAGES: gcc-5 g++-5
- make autoconf automake autopoint gettext
- libpugixml-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-5_h_tinyxml2_all:
- stage: build
- script:
- - ./tools/ci/jobs/gcc5_h_pugi.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_TINYXML2 -I/usr/include/SDL
- <<: *job-push
- variables:
- PACKAGES: gcc-5 g++-5
- make autoconf automake autopoint gettext
- libtinyxml2-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-5_h_sdl2:
- stage: build
- script:
- - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2
- <<: *job-push
- variables:
- PACKAGES: gcc-5 g++-5
- make autoconf automake autopoint gettext
- libxml2-dev libcurl4-gnutls-dev libpng-dev
- libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev
-
-gcc-5_h_sdl2_without_opengl:
- stage: build
- script:
- - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2
- <<: *job-push
- variables:
- PACKAGES: gcc-5 g++-5
- make autoconf automake autopoint gettext
- libxml2-dev libcurl4-gnutls-dev libpng-dev
- libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev
-
-gcc-5_h_all_tests:
- stage: build
- script:
- - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -I/usr/include/SDL
- <<: *job-push
- variables:
- PACKAGES: gcc-5 g++-5
- 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-5_h_all_tests_i386:
- stage: build
- script:
- - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -I/usr/include/SDL
- image: vicamo/debian:sid-i386
- <<: *job-push
- variables:
- PACKAGES: gcc-5 g++-5
- 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
- tags:
- - docker
-
gcc-5_tarball:
stage: build
script:
@@ -3540,7 +3466,6 @@ gcc-7_openglerrors:
libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
gdb valgrind netcat-openbsd procps
-
doxygen:
stage: build
script:
@@ -3560,6 +3485,63 @@ doxygen:
only:
- master
+gcc-5_h_pugi_all:
+ stage: build
+ script:
+ - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_PUGIXML -I/usr/include/SDL
+ - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_LIBXML -I/usr/include/SDL
+ - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2
+ - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -I/usr/include/SDL
+ <<: *job-push
+ variables:
+ PACKAGES: gcc-5 g++-5
+ make autoconf automake autopoint gettext
+ libpugixml-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-5_h_tinyxml2_all:
+ stage: build
+ script:
+ - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_TINYXML2 -I/usr/include/SDL
+ - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_LIBXML -I/usr/include/SDL
+ - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2
+ - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -I/usr/include/SDL
+ <<: *job-push
+ variables:
+ PACKAGES: gcc-5 g++-5
+ make autoconf automake autopoint gettext
+ libtinyxml2-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-5_h_sdl2:
+ stage: build
+ script:
+ - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2
+ - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_LIBXML -I/usr/include/SDL
+ - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2
+ - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -I/usr/include/SDL
+ <<: *job-push
+ variables:
+ PACKAGES: gcc-5 g++-5
+ make autoconf automake autopoint gettext
+ libxml2-dev libcurl4-gnutls-dev libpng-dev
+ libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev
+
+gcc-5_h_sdl2_i386:
+ stage: build
+ script:
+ - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2
+ - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_LIBXML -I/usr/include/SDL
+ - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2
+ - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -I/usr/include/SDL
+ image: vicamo/debian:sid-i386
+ <<: *job-push
+ variables:
+ PACKAGES: gcc-5 g++-5
+ make autoconf automake autopoint gettext
+ libxml2-dev libcurl4-gnutls-dev libpng-dev
+ libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev
+
gitstats:
stage: build
script: