From e15a159cc7095f2cec5e3b2fb11958aa02a8a713 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 23 Sep 2017 17:35:45 +0300 Subject: Add builds with SDL 2.0.6 into .gitlab-ci.yml --- .gitlab-ci.yml | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f80be4cb7..4858bc49d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4005,6 +4005,26 @@ gcc-7_SDL_205: tags: - docker +gcc-7_SDL_206: + 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: 206 + 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_SDL-1.2_test: stage: build script: @@ -4147,6 +4167,26 @@ gcc-7_SDL_205_test: tags: - docker +gcc-7_SDL_206_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: 206 + 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_SDL-1.2_old: stage: build script: -- cgit v1.2.3-60-g2f50