diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-08-30 21:00:05 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-08-30 21:00:05 +0300 |
| commit | ac86ab2fd4d6862210e2acbc471b20fdb665f9af (patch) | |
| tree | 9cd468b55260f3beff308cd9802af4779545c646 | |
| parent | 624bd43ad0112ab6010c463727ae722bfba1e668 (diff) | |
| download | manaplus-ac86ab2fd4d6862210e2acbc471b20fdb665f9af.tar.gz manaplus-ac86ab2fd4d6862210e2acbc471b20fdb665f9af.tar.bz2 manaplus-ac86ab2fd4d6862210e2acbc471b20fdb665f9af.tar.xz manaplus-ac86ab2fd4d6862210e2acbc471b20fdb665f9af.zip | |
Revert "Disable curl master branch build and add no oldies curl build for latest released version."
This reverts commit 04b6502017530882a754f5c8ae6adb592324d723.
| -rw-r--r-- | .gitlab-ci.yml | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 70776a01b..5c3d21096 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3794,28 +3794,7 @@ gcc-7_curl_curl-7_55_1: tags: - docker -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: +gcc-7_curl_master_no_oldies: stage: build script: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} |