From b7de43ff3f5bc076ef65e93360fc6ef9a0d5d444 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 13 Sep 2017 22:30:55 +0300 Subject: Add builds with SDL 2.0.2 into .gitlab-ci.yml --- .gitlab-ci.yml | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f740273da..80de65653 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3925,6 +3925,26 @@ gcc-7_SDL_201: tags: - docker +gcc-7_SDL_202: + stage: build + script: + - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7.sh --with-sdl2 + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh + <<: *job-push + variables: + LIBNAME: SDL + LIBVERSION: 202 + PACKAGES: gcc-7 g++-7 + make autoconf automake autopoint gettext pkg-config + libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libicu-dev + wget unzip gdb valgrind netcat-openbsd procps + runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_master.sh + runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh + tags: + - docker + gcc-7_SDL_203: stage: build script: @@ -4027,6 +4047,26 @@ gcc-7_SDL_201_test: tags: - docker +gcc-7_SDL_202_test: + stage: build + script: + - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-manaplusgame --without-dyecmd + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests + <<: *job-push + variables: + LIBNAME: SDL + LIBVERSION: 202 + PACKAGES: gcc-7 g++-7 + make autoconf automake autopoint gettext pkg-config + libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libicu-dev + valgrind + wget unzip + runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_master.sh + runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh + tags: + - docker + gcc-7_SDL_203_test: stage: build script: -- cgit v1.2.3-70-g09d2