diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-04-03 18:48:00 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-04-03 18:48:00 +0300 |
commit | 17957e4ffda0a702d5def6a9f0f14318dbb733bb (patch) | |
tree | f81a898a62ac2e810eaf96f1c66f88408c20372b | |
parent | 9e72886ee15acc39cbb6075ce32a60a5391ea9f3 (diff) | |
download | plus-17957e4ffda0a702d5def6a9f0f14318dbb733bb.tar.gz plus-17957e4ffda0a702d5def6a9f0f14318dbb733bb.tar.bz2 plus-17957e4ffda0a702d5def6a9f0f14318dbb733bb.tar.xz plus-17957e4ffda0a702d5def6a9f0f14318dbb733bb.zip |
Add into .gitlab-ci.yml with zlib master and zlib develop branches.
-rw-r--r-- | .gitlab-ci.yml | 36 |
1 files changed, 36 insertions, 0 deletions
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 |