summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-08-29 18:25:33 +0300
committerAndrei Karas <akaras@inbox.ru>2017-08-29 22:20:02 +0300
commit04b6502017530882a754f5c8ae6adb592324d723 (patch)
tree5d52f36f5fface6de61275069c12a792ac83d766
parent6c65b90a95bde4e5cee673f86efc135b92fce624 (diff)
downloadmanaplus-04b6502017530882a754f5c8ae6adb592324d723.tar.gz
manaplus-04b6502017530882a754f5c8ae6adb592324d723.tar.bz2
manaplus-04b6502017530882a754f5c8ae6adb592324d723.tar.xz
manaplus-04b6502017530882a754f5c8ae6adb592324d723.zip
Disable curl master branch build and add no oldies curl build for latest released version.
-rw-r--r--.gitlab-ci.yml23
1 files changed, 22 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aee23bcba..67dafeca7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3681,7 +3681,28 @@ gcc-7_curl_curl-7_55_1:
tags:
- docker
-gcc-7_curl_master_no_oldies:
+gcc-7_curl_curl-7_55_1_no_oldies:
+ 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: curl
+ LIBVERSION: curl-7_55_1
+ PACKAGES: gcc-7 g++-7
+ make autoconf automake autopoint gettext
+ libxml2-dev libpng-dev zlib1g-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
+ POST_CXXFLAGS: "-DCURL_NO_OLDIES"
+ tags:
+ - docker
+
+# disabled due compilation bug in curl master branch.
+.gcc-7_curl_master_no_oldies:
stage: build
script:
- ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION}