summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-10-07 19:27:42 +0300
committerAndrei Karas <akaras@inbox.ru>2017-10-07 19:27:42 +0300
commitce92cef3f62eab366e63046d11fac3137595ce29 (patch)
treeb9ef23efdd69f8a3ed27585ffb70ea060bb34e4d
parentfba2662da2494168cf9f2bee8ad428821145878b (diff)
downloadplus-ce92cef3f62eab366e63046d11fac3137595ce29.tar.gz
plus-ce92cef3f62eab366e63046d11fac3137595ce29.tar.bz2
plus-ce92cef3f62eab366e63046d11fac3137595ce29.tar.xz
plus-ce92cef3f62eab366e63046d11fac3137595ce29.zip
Remove libxml2 builds from .gitlab-ci.yml
-rw-r--r--.gitlab-ci.yml39
1 files changed, 0 insertions, 39 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6aa5534f5..173c1e0d4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3595,45 +3595,6 @@ gcc-7_libpng_libpng10:
tags:
- docker
-gcc-7_libxml2_v2.9.4:
- stage: build
- script:
- - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION}
- - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc7.sh
- - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/checkldd.sh src/manaplus
- - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh
- <<: *job-push
- variables:
- LIBNAME: libxml2
- LIBVERSION: v2.9.4
- PACKAGES: gcc-7 g++-7
- make autoconf automake autopoint gettext
- libcurl4-gnutls-dev libpng-dev zlib1g-dev libicu-dev
- libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
- wget unzip gdb valgrind netcat-openbsd procps
- tags:
- - docker
-
-# conflict with system libxml2 in gettext
-.gcc-7_libxml2_v2.8.0:
- stage: build
- script:
- - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION}
- - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc7.sh
- - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/checkldd.sh src/manaplus
- - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh
- <<: *job-push
- variables:
- LIBNAME: libxml2
- LIBVERSION: v2.8.0
- PACKAGES: gcc-7 g++-7
- make autoconf automake autopoint gettext
- libcurl4-gnutls-dev libpng-dev zlib1g-dev libicu-dev
- libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
- wget unzip gdb valgrind netcat-openbsd procps
- tags:
- - docker
-
gcc-7_SDL_SDL-1.2:
stage: build
script: