summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-03-31 03:21:29 +0300
committerAndrei Karas <akaras@inbox.ru>2017-03-31 03:21:29 +0300
commitf6304356a6f316431c42151fc51e276725770b76 (patch)
treead69504c09efc5c2145b7369c6ddd9cff8eee2a5
parent87481cea2fd6b5b2a9acffa919b49867c9829475 (diff)
downloadmv-f6304356a6f316431c42151fc51e276725770b76.tar.gz
mv-f6304356a6f316431c42151fc51e276725770b76.tar.bz2
mv-f6304356a6f316431c42151fc51e276725770b76.tar.xz
mv-f6304356a6f316431c42151fc51e276725770b76.zip
Remove from .gitlab-ci.yml tinyxml2 jobs becuase they already present in semaphoreci.
-rw-r--r--.gitlab-ci.yml74
1 files changed, 0 insertions, 74 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ba599a687..6b341e217 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -691,35 +691,6 @@ gcc-6_pugixml_tests_i386:
tags:
- docker
-gcc-6_tinyxml2_tests:
- stage: build
- script:
- - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame --enable-libxml=tinyxml2
- <<: *job-shared
- variables:
- PACKAGES: gcc-6 g++-6
- 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
- valgrind
- tags:
- - docker
-
-gcc-6_tinyxml2_tests_i386:
- stage: build
- script:
- - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame --enable-libxml=tinyxml2
- image: vicamo/debian:sid-i386
- <<: *job-shared
- variables:
- PACKAGES: gcc-6 g++-6
- 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
- valgrind
- tags:
- - docker
-
gcc-6_tests_glibcdebug_i386:
stage: build
script:
@@ -1672,51 +1643,6 @@ gcc-6_pugixml_sdl2_i386:
libpugixml-dev libcurl4-gnutls-dev libpng-dev
libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev
-gcc-6_tinyxml2:
- stage: build
- script:
- - ./tools/ci/jobs/gcc6.sh --enable-libxml=tinyxml2
- <<: *job-shared
- variables:
- PACKAGES: gcc-6 g++-6
- 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-6_tinyxml2_i386:
- stage: build
- script:
- - ./tools/ci/jobs/gcc6.sh --enable-libxml=tinyxml2
- image: vicamo/debian:sid-i386
- <<: *job-shared
- variables:
- PACKAGES: gcc-6 g++-6
- 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-6_tinyxml2_sdl2:
- stage: build
- script:
- - ./tools/ci/jobs/gcc6.sh --with-sdl2 --enable-libxml=tinyxml2
- <<: *job-shared
- variables:
- PACKAGES: gcc-6 g++-6
- make autoconf automake autopoint gettext
- libtinyxml2-dev libcurl4-gnutls-dev libpng-dev
- libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev
-
-gcc-6_tinyxml2_sdl2_i386:
- stage: build
- script:
- - ./tools/ci/jobs/gcc6.sh --with-sdl2 --enable-libxml=tinyxml2
- <<: *job-shared
- variables:
- PACKAGES: gcc-6 g++-6
- make autoconf automake autopoint gettext
- libtinyxml2-dev libcurl4-gnutls-dev libpng-dev
- libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev
-
gcc_portable:
stage: build
script: