summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-05-16 22:23:00 +0300
committerAndrei Karas <akaras@inbox.ru>2018-05-16 22:23:00 +0300
commit3a8c73e68d34bb9045b933263d6960087d6c4167 (patch)
tree47d693869f3c4fce0a88a8fcbac19ac9ceaa66b1
parente7a9e4a1101f82eec69978197bba8d3815be9562 (diff)
downloadspm-3a8c73e68d34bb9045b933263d6960087d6c4167.tar.gz
spm-3a8c73e68d34bb9045b933263d6960087d6c4167.tar.bz2
spm-3a8c73e68d34bb9045b933263d6960087d6c4167.tar.xz
spm-3a8c73e68d34bb9045b933263d6960087d6c4167.zip
Add build with curl 7.60.
-rw-r--r--.gitlab-ci.yml33
1 files changed, 33 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ad8532d..2915dca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -335,6 +335,19 @@ curl_curl-7_59_0:
installname: curl_curl-7_59_0
<<: *job-artifacts
+curl_curl-7_60_0:
+ stage: build
+ script:
+ - ./.ci/install.sh git-core bash gcc g++ make autoconf automake autopoint gettext
+ zlib1g-dev libtool
+ - ./.ci/copyspm.sh
+ - ./.ci/buildlib.sh curl curl-7_60_0
+ - grep "7.60" /usr/local/spm/bin/curl_curl-7_60_0/lib/pkgconfig/libcurl.pc
+ - ./.ci/copyfinal.sh
+ variables:
+ installname: curl_curl-7_60_0
+ <<: *job-artifacts
+
curl_master:
stage: build
script:
@@ -549,6 +562,26 @@ manaplus_curl-7_59_0:
- curl_curl-7_59_0
<<: *job-artifacts
+manaplus_curl-7_60_0:
+ stage: manaplus
+ script:
+ - ./.ci/install.sh 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
+ git wget unzip gdb valgrind netcat-openbsd procps
+ - ./.ci/clonesrc.sh
+ - cd cloned
+ - /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
+ variables:
+ LIBNAME: curl
+ LIBVERSION: curl-7_60_0
+ dependencies:
+ - curl_curl-7_60_0
+ <<: *job-artifacts
+
manaplus_master:
stage: manaplus
script: