summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml70
1 files changed, 58 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fb2617672..950ff8462 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1567,39 +1567,85 @@ gcc-6_curl_curl-7_52_1:
tags:
- docker
-.gcc-6_SDL_SDL-1.2:
+gcc-6_SDL_SDL-1.2:
stage: build
script:
- ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION}
- - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc6.sh
- - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/checkldd.sh src/manaplus
+ - echo /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz}
+ - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz} env
+ - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz} ./tools/ci/jobs/gcc6.sh
+ - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus
<<: *job-shared
variables:
LIBNAME: SDL
LIBVERSION: SDL-1.2
PACKAGES: gcc-6 g++-6
- make autoconf automake autopoint gettext libphysfs-dev
- libxml2-dev libpng-dev libcurl4-gnutls-dev zlib1g-dev
- libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
+ make autoconf automake autopoint gettext libphysfs-dev pkg-config
+ libxml2-dev libcurl4-gnutls-dev
+ libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev
wget unzip
+ runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_v1.2.8.sh
tags:
- docker
-.gcc-6_SDL_default:
+gcc-6_SDL_default:
stage: build
script:
- ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION}
- - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc6.sh
- - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/checkldd.sh src/manaplus
+ - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz} ./tools/ci/jobs/gcc6.sh --with-sdl2
+ - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus
<<: *job-shared
variables:
LIBNAME: SDL
LIBVERSION: default
PACKAGES: gcc-6 g++-6
- make autoconf automake autopoint gettext libphysfs-dev
- libxml2-dev libpng-dev libcurl4-gnutls-dev zlib1g-dev
- libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev
+ make autoconf automake autopoint gettext libphysfs-dev pkg-config
+ libxml2-dev libcurl4-gnutls-dev
+ libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev
+ wget unzip
+ runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_v1.2.8.sh
+ tags:
+ - docker
+
+gcc-6_SDL_SDL-1.2_test:
+ stage: build
+ script:
+ - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION}
+ - echo /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz}
+ - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz} env
+ - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz} ./tools/ci/jobs/gcc6_tests.sh --without-manaplusgame --without-dyecmd
+ - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
+ <<: *job-shared
+ variables:
+ LIBNAME: SDL
+ LIBVERSION: SDL-1.2
+ PACKAGES: gcc-6 g++-6
+ make autoconf automake autopoint gettext libphysfs-dev pkg-config
+ libxml2-dev libcurl4-gnutls-dev
+ libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev
+ valgrind
+ wget unzip
+ runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_v1.2.8.sh
+ tags:
+ - docker
+
+gcc-6_SDL_default_test:
+ stage: build
+ script:
+ - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION}
+ - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz} ./tools/ci/jobs/gcc6_tests.sh --with-sdl2 --without-manaplusgame --without-dyecmd
+ - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
+ <<: *job-shared
+ variables:
+ LIBNAME: SDL
+ LIBVERSION: default
+ PACKAGES: gcc-6 g++-6
+ make autoconf automake autopoint gettext libphysfs-dev pkg-config
+ libxml2-dev libcurl4-gnutls-dev
+ libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev
+ valgrind
wget unzip
+ runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_v1.2.8.sh
tags:
- docker