From ce92cef3f62eab366e63046d11fac3137595ce29 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 7 Oct 2017 19:27:42 +0300 Subject: Remove libxml2 builds from .gitlab-ci.yml --- .gitlab-ci.yml | 39 --------------------------------------- 1 file changed, 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: -- cgit v1.2.3-70-g09d2