summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml58
1 files changed, 14 insertions, 44 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7837a7650..5485c1ac6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -227,36 +227,6 @@ gcc-10_default:
tags:
- docker
-mxe_gcc6_shared_32:
- only:
- - branches@manaplus/manaplus
- stage: prebuild
- script:
- - ls /mxe
- - ./tools/ci/jobs/mxe_gcc6.sh
- <<: *job-push
- image: registry.gitlab.com/manaplus/mxe:gcc6_shared_32
- variables:
- PACKAGES: bash
- CROSS: i686-w64-mingw32.shared
- tags:
- - docker
-
-mxe_gcc6_shared_64:
- only:
- - branches@manaplus/manaplus
- stage: prebuild
- script:
- - ls /mxe
- - ./tools/ci/jobs/mxe_gcc6.sh
- <<: *job-push
- image: registry.gitlab.com/manaplus/mxe:gcc6_shared_64
- variables:
- PACKAGES: bash
- CROSS: x86_64-w64-mingw32.shared
- tags:
- - docker
-
gcc-5_sdl2:
stage: prebuild
script:
@@ -296,7 +266,7 @@ gcc-10_dyecmd_only:
stage: prebuild
script:
- ./tools/ci/scripts/patchsdl1.sh
- - ./tools/ci/jobs/gcc10.sh --without-manaplusgame
+ - ./tools/ci/jobs/gcc10.sh --without-manaversegame
- ./tools/ci/scripts/rundyecmd.sh
<<: *job-push
variables:
@@ -311,7 +281,7 @@ gcc-8_unittestsbin:
stage: prebuild
script:
- ./tools/ci/scripts/patchsdl1.sh
- - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin --without-manaplusgame --without-dyecmd
+ - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin --without-manaversegame --without-dyecmd
image: debian:buster
<<: *job-push
variables:
@@ -393,7 +363,7 @@ gcc-5_h_all:
script:
- mkdir -p coverage/
- ./tools/ci/scripts/patchsdl1.sh
- - ./tools/ci/jobs/gcc7_tests_gcov.sh --without-dyecmd --without-manaplusgame
+ - ./tools/ci/jobs/gcc7_tests_gcov.sh --without-dyecmd --without-manaversegame
variables:
PACKAGES: gcc-7 g++-7
make autoconf automake autopoint gettext
@@ -466,7 +436,7 @@ triggers:
- echo /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz}
- export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libasan.so.4
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} env
- - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --without-manaplusgame --without-dyecmd
+ - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --without-manaversegame --without-dyecmd
- export LD_PRELOAD
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
- ldd ./src/manaplustests | grep "libasan"
@@ -492,7 +462,7 @@ triggers:
script:
- ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION}
- export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libasan.so.4
- - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --with-sdl2 --without-manaplusgame --without-dyecmd
+ - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --with-sdl2 --without-manaversegame --without-dyecmd
- export LD_PRELOAD
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
- ldd ./src/manaplustests | grep "libasan"
@@ -519,7 +489,7 @@ triggers:
- ./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 ${runenvx} ${runenvz} env
- - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --without-manaplusgame --without-dyecmd
+ - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --without-manaversegame --without-dyecmd
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
- ldd ./src/manaplustests | grep "libasan"
<<: *job-push
@@ -541,7 +511,7 @@ triggers:
stage: build
script:
- ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION}
- - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --with-sdl2 --without-manaplusgame --without-dyecmd
+ - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --with-sdl2 --without-manaversegame --without-dyecmd
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
- ldd ./src/manaplustests | grep "libasan"
<<: *job-push
@@ -566,7 +536,7 @@ triggers:
- ./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 ${runenvx} ${runenvz} env
- - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --without-manaplusgame --without-dyecmd
+ - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --without-manaversegame --without-dyecmd
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
- ldd ./src/manaplustests | grep "libasan"
<<: *job-push
@@ -590,7 +560,7 @@ triggers:
stage: build
script:
- ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION}
- - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --with-sdl2 --without-manaplusgame --without-dyecmd
+ - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --with-sdl2 --without-manaversegame --without-dyecmd
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
- ldd ./src/manaplustests | grep "libasan"
<<: *job-push
@@ -616,7 +586,7 @@ triggers:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION}
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc10.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/checkldd.sh src/manaverse
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh
<<: *job-push
variables:
@@ -639,7 +609,7 @@ triggers:
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} env
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize.sh
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh
- - ldd ./src/manaplus | grep "libasan"
+ - ldd ./src/manaverse | grep "libasan"
<<: *job-push
variables:
LIBNAME: SDL
@@ -661,7 +631,7 @@ triggers:
- ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION}
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize.sh --with-sdl2
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh
- - ldd ./src/manaplus | grep "libasan"
+ - ldd ./src/manaverse | grep "libasan"
<<: *job-push
variables:
LIBNAME: SDL
@@ -686,7 +656,7 @@ triggers:
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} env
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize.sh
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh
- - ldd ./src/manaplus | grep "libasan"
+ - ldd ./src/manaverse | grep "libasan"
<<: *job-push
variables:
LIBNAME: SDL
@@ -710,7 +680,7 @@ triggers:
- ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION}
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize.sh --with-sdl2
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh
- - ldd ./src/manaplus | grep "libasan"
+ - ldd ./src/manaverse | grep "libasan"
<<: *job-push
variables:
LIBNAME: SDL