From 17957e4ffda0a702d5def6a9f0f14318dbb733bb Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 3 Apr 2017 18:48:00 +0300 Subject: Add into .gitlab-ci.yml with zlib master and zlib develop branches. --- .gitlab-ci.yml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a6d3e388e..92ee6958c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1859,6 +1859,42 @@ gcc-6_zlib_v1.2.11: tags: - docker +gcc-6_zlib_master: + stage: build + script: + - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc6.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/checkldd.sh src/manaplus + <<: *job-shared + variables: + LIBNAME: zlib + LIBVERSION: master + PACKAGES: gcc-6 g++-6 + 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 + wget unzip + tags: + - docker + +gcc-6_zlib_develop: + stage: build + script: + - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc6.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/checkldd.sh src/manaplus + <<: *job-shared + variables: + LIBNAME: zlib + LIBVERSION: develop + PACKAGES: gcc-6 g++-6 + 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 + wget unzip + tags: + - docker + # error compilation. cant find SDL. .gcc-6_zlib_ng_develop: stage: build -- cgit v1.2.3-70-g09d2