diff options
Diffstat (limited to 'tools/ci')
28 files changed, 191 insertions, 191 deletions
diff --git a/tools/ci/branches/.gitlab-ci_header.yml b/tools/ci/branches/.gitlab-ci_header.yml index faeae1416..122e1d3d7 100644 --- a/tools/ci/branches/.gitlab-ci_header.yml +++ b/tools/ci/branches/.gitlab-ci_header.yml @@ -12,7 +12,7 @@ before_script: - ":; ${DOCKERRETRY} ${PMUPDATE} >logs/apt.log" - ":; ${DOCKERRETRY} ${PMINSTALL} ${PACKAGES} >>logs/apt.log" - ":; ./tools/ci/scripts/clonesrc.sh" - - ":; cd manaplus" + - ":; cd manaverse" image: debian:unstable diff --git a/tools/ci/branches/ci_clang6/.gitlab-ci.yml b/tools/ci/branches/ci_clang6/.gitlab-ci.yml index 0ec29486d..c6542a05b 100644 --- a/tools/ci/branches/ci_clang6/.gitlab-ci.yml +++ b/tools/ci/branches/ci_clang6/.gitlab-ci.yml @@ -18,7 +18,7 @@ clang-6.0_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/clang60_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/clang60_tests.sh --without-dyecmd --without-manaversegame <<: *job-push image: debian:bullseye variables: @@ -34,7 +34,7 @@ clang-6.0_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/clang60_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/clang60_tests.sh --without-dyecmd --without-manaversegame <<: *job-push image: i386/debian:bullseye variables: @@ -49,7 +49,7 @@ clang-6.0_tests_i386: clang-6.0_tests_sdl2: stage: build script: - - ./tools/ci/jobs/clang60_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/clang60_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame <<: *job-push image: debian:bullseye variables: @@ -64,7 +64,7 @@ clang-6.0_tests_sdl2: clang-6.0_tests_sdl2_i386: stage: build script: - - ./tools/ci/jobs/clang60_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/clang60_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame <<: *job-push image: i386/debian:bullseye variables: diff --git a/tools/ci/branches/ci_clang7/.gitlab-ci.yml b/tools/ci/branches/ci_clang7/.gitlab-ci.yml index fd92572f6..26ac78154 100644 --- a/tools/ci/branches/ci_clang7/.gitlab-ci.yml +++ b/tools/ci/branches/ci_clang7/.gitlab-ci.yml @@ -18,7 +18,7 @@ clang-7.0_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/clang70_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/clang70_tests.sh --without-dyecmd --without-manaversegame <<: *job-push image: debian:buster variables: @@ -34,7 +34,7 @@ clang-7.0_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/clang70_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/clang70_tests.sh --without-dyecmd --without-manaversegame <<: *job-push image: i386/debian:buster variables: @@ -49,7 +49,7 @@ clang-7.0_tests_i386: clang-7.0_tests_sdl2: stage: build script: - - ./tools/ci/jobs/clang70_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/clang70_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame <<: *job-push image: debian:buster variables: @@ -64,7 +64,7 @@ clang-7.0_tests_sdl2: clang-7.0_tests_sdl2_i386: stage: build script: - - ./tools/ci/jobs/clang70_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/clang70_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame <<: *job-push image: i386/debian:buster variables: diff --git a/tools/ci/branches/ci_fedora/.gitlab-ci.yml b/tools/ci/branches/ci_fedora/.gitlab-ci.yml index 125b2f9d2..6c2112d54 100644 --- a/tools/ci/branches/ci_fedora/.gitlab-ci.yml +++ b/tools/ci/branches/ci_fedora/.gitlab-ci.yml @@ -20,7 +20,7 @@ stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gccsnapshot_sanitize_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gccsnapshot_sanitize_tests.sh --without-dyecmd --without-manaversegame - ldd ./src/manaplustests | grep "libasan" <<: *job-push image: fedora:rawhide @@ -34,7 +34,7 @@ .fedora_gcc-snapshot_sanitize_sdl2_tests: stage: build script: - - ./tools/ci/jobs/gccsnapshot_sanitize_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gccsnapshot_sanitize_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame - ldd ./src/manaplustests | grep "libasan" <<: *job-push image: fedora:rawhide @@ -49,7 +49,7 @@ fedora_gcc-snapshot_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gccsnapshot_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gccsnapshot_tests.sh --without-dyecmd --without-manaversegame <<: *job-push image: fedora:rawhide variables: @@ -62,7 +62,7 @@ fedora_gcc-snapshot_tests: fedora_gcc-snapshot_sdl2_tests: stage: build script: - - ./tools/ci/jobs/gccsnapshot_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gccsnapshot_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame <<: *job-push image: fedora:rawhide variables: diff --git a/tools/ci/branches/ci_gcc10_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc10_tests/.gitlab-ci.yml index 48caf86ff..61266e9ad 100644 --- a/tools/ci/branches/ci_gcc10_tests/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc10_tests/.gitlab-ci.yml @@ -21,7 +21,7 @@ stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaversegame - ldd ./src/manaplustests | grep "libasan" <<: *job-push variables: @@ -39,7 +39,7 @@ stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-glibcdebug --enable-unittests=doctest --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-glibcdebug --enable-unittests=doctest --without-dyecmd --without-manaversegame - ldd ./src/manaplustests | grep "libasan" <<: *job-push variables: @@ -56,7 +56,7 @@ gcc-10_doctest_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc10_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaversegame image: i386/debian:unstable <<: *job-push variables: @@ -73,7 +73,7 @@ gcc-10_tests_simd: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_tests_simd.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc10_tests_simd.sh --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-10 g++-10 @@ -88,7 +88,7 @@ gcc-10_tests_O0: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_tests_simd.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc10_tests_simd.sh --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-O0" @@ -104,7 +104,7 @@ gcc-10_tests_O1: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_tests_simd.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc10_tests_simd.sh --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-O1" @@ -120,7 +120,7 @@ gcc-10_tests_lto: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-ffast-math -O10 -flto -fwhole-program -funswitch-loops" @@ -136,7 +136,7 @@ gcc-10_tests_lto_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaversegame <<: *job-push image: i386/debian:unstable variables: @@ -153,7 +153,7 @@ gcc-10_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaversegame image: i386/debian:unstable <<: *job-push variables: @@ -169,8 +169,8 @@ gcc-10_tests_flags: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug - - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaplusgame --enable-stldebug + - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaversegame --enable-glibcdebug + - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaversegame --enable-stldebug <<: *job-push variables: PACKAGES: gcc-10 g++-10 @@ -185,7 +185,7 @@ gcc-10_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-10 g++-10 @@ -199,7 +199,7 @@ gcc-10_tests: gcc-10_sdl2_tests_i386: stage: build script: - - ./tools/ci/jobs/gcc10_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc10_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame image: i386/debian:unstable <<: *job-push variables: @@ -215,7 +215,7 @@ gcc-10_sdl2_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaplusgame || true + - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaversegame || true - echo test valgrind - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log - grep "invalid" logs/valg.log && exit 1 || true @@ -233,7 +233,7 @@ gcc-10_sdl2_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaplusgame || true + - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaversegame || true - echo test valgrind - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log - grep "invalid" logs/valg.log && exit 1 || true @@ -252,7 +252,7 @@ gcc-10_separate_doctest: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/gcc10_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd - ./tools/ci/scripts/separateunittests.sh <<: *job-push variables: @@ -266,7 +266,7 @@ gcc-10_separate_doctest_sanitize: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/gcc10_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd - ./tools/ci/scripts/separateunittests.sh - ldd ./src/manaplustests | grep "libasan" <<: *job-push @@ -291,7 +291,7 @@ gcc-10_separate_doctest_sanitize: gcc-10_separate_doctest_sanitize_sdl2: stage: build script: - - ./tools/ci/jobs/gcc10_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd --with-sdl2 + - ./tools/ci/jobs/gcc10_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd --with-sdl2 - ./tools/ci/scripts/separateunittests.sh - ldd ./src/manaplustests | grep "libasan" <<: *job-push @@ -317,7 +317,7 @@ gcc-10_separate_doctest_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/gcc10_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd - ./tools/ci/scripts/separateunittests.sh <<: *job-push image: i386/debian:unstable @@ -333,7 +333,7 @@ gcc-10_separate_doctest_i386: gcc-10_separate_doctest_sdl2_i386: stage: build script: - - ./tools/ci/jobs/gcc10_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd --with-sdl2 + - ./tools/ci/jobs/gcc10_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd --with-sdl2 - ./tools/ci/scripts/separateunittests.sh <<: *job-push image: i386/debian:unstable @@ -364,7 +364,7 @@ gcc-10_systemcatch_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_tests.sh --enable-unittests=systemcatch --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc10_tests.sh --enable-unittests=systemcatch --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-10 g++-10 @@ -380,7 +380,7 @@ gcc-10_systemdoctest_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_tests.sh --enable-unittests=systemdoctest --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc10_tests.sh --enable-unittests=systemdoctest --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-10 g++-10 @@ -396,7 +396,7 @@ gcc-10_unsigned_char_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-funsigned-char" @@ -411,7 +411,7 @@ gcc-10_unsigned_char_tests: gcc-10_sdl2_unsigned_char_tests: stage: build script: - - ./tools/ci/jobs/gcc10_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc10_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-funsigned-char" diff --git a/tools/ci/branches/ci_gcc49/.gitlab-ci.yml b/tools/ci/branches/ci_gcc49/.gitlab-ci.yml index d5e2872df..ba6da2135 100644 --- a/tools/ci/branches/ci_gcc49/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc49/.gitlab-ci.yml @@ -93,7 +93,7 @@ gcc-4.9_sdl2_sanitize: gentoo_gcc-4.9_tests: stage: build script: - - ./tools/ci/jobs/gcc49_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc49_tests.sh --without-dyecmd --without-manaversegame image: registry.gitlab.com/manaplus/images:gentoo_gcc49_sdl1 <<: *job-push variables: @@ -107,7 +107,7 @@ gentoo_gcc-4.9_tests: gentoo_gcc-4.9_tests_sdl2: stage: build script: - - ./tools/ci/jobs/gcc49_tests.sh --without-dyecmd --without-manaplusgame --with-sdl2 + - ./tools/ci/jobs/gcc49_tests.sh --without-dyecmd --without-manaversegame --with-sdl2 image: registry.gitlab.com/manaplus/images:gentoo_gcc49_sdl2 <<: *job-push variables: diff --git a/tools/ci/branches/ci_gcc5/.gitlab-ci.yml b/tools/ci/branches/ci_gcc5/.gitlab-ci.yml index 63c86ffa1..4b515e4b1 100644 --- a/tools/ci/branches/ci_gcc5/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc5/.gitlab-ci.yml @@ -71,7 +71,7 @@ gcc-5_sanitize_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc5_sanitize_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc5_sanitize_tests.sh --without-dyecmd --without-manaversegame - ldd ./src/manaplustests | grep "libasan" image: i386/ubuntu:xenial <<: *job-push @@ -88,7 +88,7 @@ gcc-5_sanitize_no_opengl_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc5_sanitize_tests.sh --without-opengl --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc5_sanitize_tests.sh --without-opengl --without-dyecmd --without-manaversegame - ldd ./src/manaplustests | grep "libasan" image: ubuntu:xenial <<: *job-push @@ -106,7 +106,7 @@ gcc-5_sanitize_no_opengl_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc5_sanitize_tests.sh --without-opengl --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc5_sanitize_tests.sh --without-opengl --without-dyecmd --without-manaversegame - ldd ./src/manaplustests | grep "libasan" image: i386/ubuntu:xenial <<: *job-push @@ -174,7 +174,7 @@ gcc-5_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc5_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc5_tests.sh --without-dyecmd --without-manaversegame image: i386/ubuntu:xenial <<: *job-push variables: @@ -189,8 +189,8 @@ gcc-5_tests_i386: gcc-5_sdl2_tests: stage: build script: - - ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-manaplusgame --enable-glibcdebug - - ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-manaplusgame --enable-stldebug + - ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-manaversegame --enable-glibcdebug + - ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-manaversegame --enable-stldebug image: ubuntu:xenial <<: *job-push variables: @@ -205,7 +205,7 @@ gcc-5_sdl2_tests: gcc-5_sdl2_tests_i386: stage: build script: - - ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-dyecmd --without-manaversegame image: i386/ubuntu:xenial <<: *job-push variables: @@ -220,7 +220,7 @@ gcc-5_sdl2_tests_i386: gcc-5_sdl2_no_opengl_tests: stage: build script: - - ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-opengl --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-opengl --without-dyecmd --without-manaversegame image: ubuntu:xenial <<: *job-push variables: @@ -235,7 +235,7 @@ gcc-5_sdl2_no_opengl_tests: gcc-5_sdl2_no_opengl_tests_i386: stage: build script: - - ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-opengl --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-opengl --without-dyecmd --without-manaversegame image: i386/ubuntu:xenial <<: *job-push variables: diff --git a/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml index f26477e95..7f451af66 100644 --- a/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml @@ -20,7 +20,7 @@ gcc-6_sanitize_doctest_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaversegame - ldd ./src/manaplustests | grep "libasan" image: debian:stretch <<: *job-push @@ -37,7 +37,7 @@ gcc-6_doctest_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc6_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaversegame image: i386/debian:stretch <<: *job-push variables: @@ -53,7 +53,7 @@ gcc-6_tests_simd: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6_tests_simd.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc6_tests_simd.sh --without-dyecmd --without-manaversegame image: debian:stretch <<: *job-push variables: @@ -69,7 +69,7 @@ gcc-6_tests_lto: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaversegame image: debian:stretch <<: *job-push variables: @@ -86,7 +86,7 @@ gcc-6_tests_lto_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaversegame <<: *job-push image: i386/debian:stretch variables: @@ -103,7 +103,7 @@ gcc-6_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaversegame image: debian:stretch <<: *job-push variables: @@ -119,7 +119,7 @@ gcc-6_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaversegame image: i386/debian:stretch <<: *job-push variables: @@ -135,7 +135,7 @@ gcc-6_tests_glibcdebug: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug + - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaversegame --enable-glibcdebug image: debian:stretch <<: *job-push variables: @@ -151,7 +151,7 @@ gcc-6_tests_glibcdebug_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug + - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaversegame --enable-glibcdebug image: i386/debian:stretch <<: *job-push variables: @@ -166,7 +166,7 @@ gcc-6_tests_glibcdebug_i386: gcc-6_sdl2_tests: stage: build script: - - ./tools/ci/jobs/gcc6_sdl2_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc6_sdl2_tests.sh --without-dyecmd --without-manaversegame image: debian:stretch <<: *job-push variables: @@ -181,7 +181,7 @@ gcc-6_sdl2_tests: gcc-6_sdl2_tests_i386: stage: build script: - - ./tools/ci/jobs/gcc6_sdl2_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc6_sdl2_tests.sh --without-dyecmd --without-manaversegame image: i386/debian:stretch <<: *job-push variables: @@ -197,7 +197,7 @@ gcc-6_tests_valgrind: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame || true + - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaversegame || true - echo test valgrind - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log - grep "invalid" logs/valg.log && exit 1 || true @@ -216,7 +216,7 @@ gcc-6_tests_valgrind_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame || true + - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaversegame || true - echo test valgrind - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log - grep "invalid" logs/valg.log && exit 1 || true @@ -235,7 +235,7 @@ gcc-6_tarball_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6_tarball_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc6_tarball_tests.sh --without-dyecmd --without-manaversegame image: debian:stretch <<: *job-push variables: diff --git a/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml index d1be7f727..b8489f7ab 100644 --- a/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml @@ -20,7 +20,7 @@ gcc-7_sanitize_doctest_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_sanitize_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc7_sanitize_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaversegame - ldd ./src/manaplustests | grep "libasan" image: debian:buster <<: *job-push @@ -38,7 +38,7 @@ gcc-7_doctest_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc7_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaversegame image: i386/debian:buster <<: *job-push variables: @@ -55,7 +55,7 @@ gcc-7_tests_simd: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_tests_simd.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc7_tests_simd.sh --without-dyecmd --without-manaversegame image: debian:buster <<: *job-push variables: @@ -71,7 +71,7 @@ gcc-7_tests_O0: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_tests_simd.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc7_tests_simd.sh --without-dyecmd --without-manaversegame image: debian:buster <<: *job-push variables: @@ -88,7 +88,7 @@ gcc-7_tests_O1: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_tests_simd.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc7_tests_simd.sh --without-dyecmd --without-manaversegame image: debian:buster <<: *job-push variables: @@ -105,7 +105,7 @@ gcc-7_tests_lto: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaversegame image: debian:buster <<: *job-push variables: @@ -122,7 +122,7 @@ gcc-7_tests_lto_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaversegame <<: *job-push image: i386/debian:buster variables: @@ -139,7 +139,7 @@ gcc-7_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaversegame image: i386/debian:buster <<: *job-push variables: @@ -155,8 +155,8 @@ gcc-7_tests_flags: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug - - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --enable-stldebug + - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaversegame --enable-glibcdebug + - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaversegame --enable-stldebug image: debian:buster <<: *job-push variables: @@ -172,7 +172,7 @@ gcc-7_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaversegame image: debian:buster <<: *job-push variables: @@ -187,7 +187,7 @@ gcc-7_tests: gcc-7_sdl2_tests_i386: stage: build script: - - ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame image: i386/debian:buster <<: *job-push variables: @@ -203,7 +203,7 @@ gcc-7_sdl2_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame || true + - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaversegame || true - echo test valgrind - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log - grep "invalid" logs/valg.log && exit 1 || true @@ -222,7 +222,7 @@ gcc-7_sdl2_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame || true + - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaversegame || true - echo test valgrind - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log - grep "invalid" logs/valg.log && exit 1 || true @@ -241,7 +241,7 @@ gcc-7_separate_doctest: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd - ./tools/ci/scripts/separateunittests.sh image: debian:buster <<: *job-push @@ -256,7 +256,7 @@ gcc-7_separate_doctest_sanitize: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd - ./tools/ci/scripts/separateunittests.sh - ldd ./src/manaplustests | grep "libasan" image: debian:buster @@ -282,7 +282,7 @@ gcc-7_separate_doctest_sanitize: gcc-7_separate_doctest_sanitize_sdl2: stage: build script: - - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd --with-sdl2 + - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd --with-sdl2 - ./tools/ci/scripts/separateunittests.sh - ldd ./src/manaplustests | grep "libasan" image: debian:buster @@ -309,7 +309,7 @@ gcc-7_separate_doctest_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd - ./tools/ci/scripts/separateunittests.sh <<: *job-push image: i386/debian:buster @@ -325,7 +325,7 @@ gcc-7_separate_doctest_i386: gcc-7_separate_doctest_sdl2_i386: stage: build script: - - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd --with-sdl2 + - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd --with-sdl2 - ./tools/ci/scripts/separateunittests.sh <<: *job-push image: i386/debian:buster @@ -342,7 +342,7 @@ gcc-7_unsigned_char_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaversegame image: debian:buster <<: *job-push variables: @@ -358,7 +358,7 @@ gcc-7_unsigned_char_tests: gcc-7_sdl2_unsigned_char_tests: stage: build script: - - ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame image: debian:buster <<: *job-push variables: diff --git a/tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml index 65c5b8be5..804ffed5e 100644 --- a/tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml @@ -21,7 +21,7 @@ stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_sanitize_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_sanitize_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaversegame - ldd ./src/manaplustests | grep "libasan" <<: *job-push variables: @@ -39,7 +39,7 @@ stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_sanitize_tests.sh --enable-glibcdebug --enable-unittests=doctest --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_sanitize_tests.sh --enable-glibcdebug --enable-unittests=doctest --without-dyecmd --without-manaversegame - ldd ./src/manaplustests | grep "libasan" <<: *job-push variables: @@ -56,7 +56,7 @@ gcc-8_doctest_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaversegame image: i386/debian:unstable <<: *job-push variables: @@ -73,7 +73,7 @@ gcc-8_tests_simd: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests_simd.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests_simd.sh --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-8 g++-8 @@ -88,7 +88,7 @@ gcc-8_tests_O0: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests_simd.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests_simd.sh --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-O0" @@ -104,7 +104,7 @@ gcc-8_tests_O1: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests_simd.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests_simd.sh --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-O1" @@ -120,7 +120,7 @@ gcc-8_tests_lto: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-ffast-math -O9 -flto -fwhole-program -funswitch-loops" @@ -136,7 +136,7 @@ gcc-8_tests_lto_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaversegame <<: *job-push image: i386/debian:unstable variables: @@ -153,7 +153,7 @@ gcc-8_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaversegame image: i386/debian:unstable <<: *job-push variables: @@ -169,8 +169,8 @@ gcc-8_tests_flags: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug - - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame --enable-stldebug + - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaversegame --enable-glibcdebug + - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaversegame --enable-stldebug <<: *job-push variables: PACKAGES: gcc-8 g++-8 @@ -185,7 +185,7 @@ gcc-8_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-8 g++-8 @@ -199,7 +199,7 @@ gcc-8_tests: gcc-8_sdl2_tests_i386: stage: build script: - - ./tools/ci/jobs/gcc8_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame image: i386/debian:unstable <<: *job-push variables: @@ -215,7 +215,7 @@ gcc-8_sdl2_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame || true + - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaversegame || true - echo test valgrind - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log - grep "invalid" logs/valg.log && exit 1 || true @@ -233,7 +233,7 @@ gcc-8_sdl2_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame || true + - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaversegame || true - echo test valgrind - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log - grep "invalid" logs/valg.log && exit 1 || true @@ -252,7 +252,7 @@ gcc-8_separate_doctest: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd - ./tools/ci/scripts/separateunittests.sh <<: *job-push variables: @@ -266,7 +266,7 @@ gcc-8_separate_doctest_sanitize: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd - ./tools/ci/scripts/separateunittests.sh - ldd ./src/manaplustests | grep "libasan" <<: *job-push @@ -291,7 +291,7 @@ gcc-8_separate_doctest_sanitize: gcc-8_separate_doctest_sanitize_sdl2: stage: build script: - - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd --with-sdl2 + - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd --with-sdl2 - ./tools/ci/scripts/separateunittests.sh - ldd ./src/manaplustests | grep "libasan" <<: *job-push @@ -317,7 +317,7 @@ gcc-8_separate_doctest_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd - ./tools/ci/scripts/separateunittests.sh <<: *job-push image: i386/debian:unstable @@ -333,7 +333,7 @@ gcc-8_separate_doctest_i386: gcc-8_separate_doctest_sdl2_i386: stage: build script: - - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd --with-sdl2 + - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd --with-sdl2 - ./tools/ci/scripts/separateunittests.sh <<: *job-push image: i386/debian:unstable @@ -364,7 +364,7 @@ gcc-8_systemcatch_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --enable-unittests=systemcatch --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests.sh --enable-unittests=systemcatch --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-8 g++-8 @@ -380,7 +380,7 @@ gcc-8_systemdoctest_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --enable-unittests=systemdoctest --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests.sh --enable-unittests=systemdoctest --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-8 g++-8 @@ -396,7 +396,7 @@ gcc-8_unsigned_char_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-funsigned-char" @@ -411,7 +411,7 @@ gcc-8_unsigned_char_tests: gcc-8_sdl2_unsigned_char_tests: stage: build script: - - ./tools/ci/jobs/gcc8_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-funsigned-char" diff --git a/tools/ci/branches/ci_gcc9_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc9_tests/.gitlab-ci.yml index 90f668189..47f25d598 100644 --- a/tools/ci/branches/ci_gcc9_tests/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc9_tests/.gitlab-ci.yml @@ -21,7 +21,7 @@ stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_sanitize_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc9_sanitize_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaversegame - ldd ./src/manaplustests | grep "libasan" <<: *job-push variables: @@ -39,7 +39,7 @@ stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_sanitize_tests.sh --enable-glibcdebug --enable-unittests=doctest --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc9_sanitize_tests.sh --enable-glibcdebug --enable-unittests=doctest --without-dyecmd --without-manaversegame - ldd ./src/manaplustests | grep "libasan" <<: *job-push variables: @@ -56,7 +56,7 @@ gcc-9_doctest_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc9_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaversegame image: i386/debian:unstable <<: *job-push variables: @@ -73,7 +73,7 @@ gcc-9_tests_simd: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_tests_simd.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc9_tests_simd.sh --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-9 g++-9 @@ -88,7 +88,7 @@ gcc-9_tests_O0: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_tests_simd.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc9_tests_simd.sh --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-O0" @@ -104,7 +104,7 @@ gcc-9_tests_O1: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_tests_simd.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc9_tests_simd.sh --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-O1" @@ -120,7 +120,7 @@ gcc-9_tests_lto: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-ffast-math -O9 -flto -fwhole-program -funswitch-loops" @@ -136,7 +136,7 @@ gcc-9_tests_lto_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaversegame <<: *job-push image: i386/debian:unstable variables: @@ -153,7 +153,7 @@ gcc-9_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaversegame image: i386/debian:unstable <<: *job-push variables: @@ -169,8 +169,8 @@ gcc-9_tests_flags: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug - - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaplusgame --enable-stldebug + - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaversegame --enable-glibcdebug + - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaversegame --enable-stldebug <<: *job-push variables: PACKAGES: gcc-9 g++-9 @@ -185,7 +185,7 @@ gcc-9_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-9 g++-9 @@ -199,7 +199,7 @@ gcc-9_tests: gcc-9_sdl2_tests_i386: stage: build script: - - ./tools/ci/jobs/gcc9_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc9_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame image: i386/debian:unstable <<: *job-push variables: @@ -215,7 +215,7 @@ gcc-9_sdl2_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaplusgame || true + - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaversegame || true - echo test valgrind - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log - grep "invalid" logs/valg.log && exit 1 || true @@ -233,7 +233,7 @@ gcc-9_sdl2_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaplusgame || true + - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaversegame || true - echo test valgrind - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log - grep "invalid" logs/valg.log && exit 1 || true @@ -252,7 +252,7 @@ gcc-9_separate_doctest: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/gcc9_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd - ./tools/ci/scripts/separateunittests.sh <<: *job-push variables: @@ -266,7 +266,7 @@ gcc-9_separate_doctest_sanitize: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/gcc9_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd - ./tools/ci/scripts/separateunittests.sh - ldd ./src/manaplustests | grep "libasan" <<: *job-push @@ -293,7 +293,7 @@ gcc-9_separate_doctest_sanitize: gcc-9_separate_doctest_sanitize_sdl2: stage: build script: - - ./tools/ci/jobs/gcc9_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd --with-sdl2 + - ./tools/ci/jobs/gcc9_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd --with-sdl2 - ./tools/ci/scripts/separateunittests.sh - ldd ./src/manaplustests | grep "libasan" <<: *job-push @@ -320,7 +320,7 @@ gcc-9_separate_doctest_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/gcc9_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd - ./tools/ci/scripts/separateunittests.sh <<: *job-push image: i386/debian:unstable @@ -336,7 +336,7 @@ gcc-9_separate_doctest_i386: gcc-9_separate_doctest_sdl2_i386: stage: build script: - - ./tools/ci/jobs/gcc9_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd --with-sdl2 + - ./tools/ci/jobs/gcc9_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd --with-sdl2 - ./tools/ci/scripts/separateunittests.sh <<: *job-push image: i386/debian:unstable @@ -367,7 +367,7 @@ gcc-9_systemcatch_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_tests.sh --enable-unittests=systemcatch --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc9_tests.sh --enable-unittests=systemcatch --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-9 g++-9 @@ -383,7 +383,7 @@ gcc-9_systemdoctest_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_tests.sh --enable-unittests=systemdoctest --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc9_tests.sh --enable-unittests=systemdoctest --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-9 g++-9 @@ -399,7 +399,7 @@ gcc-9_unsigned_char_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-funsigned-char" @@ -414,7 +414,7 @@ gcc-9_unsigned_char_tests: gcc-9_sdl2_unsigned_char_tests: stage: build script: - - ./tools/ci/jobs/gcc9_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc9_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-funsigned-char" diff --git a/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml b/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml index 2ada2b528..7d479426e 100644 --- a/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml +++ b/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml @@ -20,7 +20,7 @@ gcc-8_tests_glibcdebug_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug + - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaversegame --enable-glibcdebug image: i386/debian:unstable <<: *job-push variables: @@ -95,7 +95,7 @@ clang-7.0_glibcdebug_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/clang70_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug + - ./tools/ci/jobs/clang70_tests.sh --without-dyecmd --without-manaversegame --enable-glibcdebug <<: *job-push image: debian:buster variables: @@ -110,7 +110,7 @@ clang-7.0_glibcdebug_tests: clang-7.0_glibcdebug_tests_sdl2: stage: build script: - - ./tools/ci/jobs/clang70_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame --enable-glibcdebug + - ./tools/ci/jobs/clang70_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame --enable-glibcdebug <<: *job-push image: debian:buster variables: diff --git a/tools/ci/branches/ci_malloc/.gitlab-ci.yml b/tools/ci/branches/ci_malloc/.gitlab-ci.yml index ace0f93a3..9a88deb46 100644 --- a/tools/ci/branches/ci_malloc/.gitlab-ci.yml +++ b/tools/ci/branches/ci_malloc/.gitlab-ci.yml @@ -19,7 +19,7 @@ gcc-8_tests_jmalloc: script: - ls ${MALLOC} - ./tools/ci/scripts/patchsdl1.sh - - LD_PRELOAD=${MALLOC} ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame + - LD_PRELOAD=${MALLOC} ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-8 g++-8 @@ -36,7 +36,7 @@ gcc-8_tests_jmalloc_i386: script: - ls ${MALLOC} - ./tools/ci/scripts/patchsdl1.sh - - LD_PRELOAD=${MALLOC} ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame + - LD_PRELOAD=${MALLOC} ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaversegame <<: *job-push image: i386/debian:unstable variables: @@ -53,7 +53,7 @@ gcc-8_tests_jmalloc_sdl2: stage: build script: - ls ${MALLOC} - - LD_PRELOAD=${MALLOC} ./tools/ci/jobs/gcc8_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - LD_PRELOAD=${MALLOC} ./tools/ci/jobs/gcc8_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-8 g++-8 @@ -69,7 +69,7 @@ gcc-8_tests_jmalloc_sdl2_i386: stage: build script: - ls ${MALLOC} - - LD_PRELOAD=${MALLOC} ./tools/ci/jobs/gcc8_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - LD_PRELOAD=${MALLOC} ./tools/ci/jobs/gcc8_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame <<: *job-push image: i386/debian:unstable variables: @@ -86,7 +86,7 @@ gcc-8_tests_tcmalloc: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --enable-tcmalloc --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests.sh --enable-tcmalloc --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-8 g++-8 @@ -101,7 +101,7 @@ gcc-8_tests_tcmalloc_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --enable-tcmalloc --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests.sh --enable-tcmalloc --without-dyecmd --without-manaversegame <<: *job-push image: i386/debian:unstable variables: @@ -116,7 +116,7 @@ gcc-8_tests_tcmalloc_i386: gcc-8_tests_tcmalloc_sdl2: stage: build script: - - ./tools/ci/jobs/gcc8_tests.sh --enable-tcmalloc --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests.sh --enable-tcmalloc --with-sdl2 --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-8 g++-8 @@ -130,7 +130,7 @@ gcc-8_tests_tcmalloc_sdl2: gcc-8_tests_tcmalloc_sdl2_i386: stage: build script: - - ./tools/ci/jobs/gcc8_tests.sh --enable-tcmalloc --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests.sh --enable-tcmalloc --with-sdl2 --without-dyecmd --without-manaversegame <<: *job-push image: i386/debian:unstable variables: diff --git a/tools/ci/branches/ci_mse/.gitlab-ci.yml b/tools/ci/branches/ci_mse/.gitlab-ci.yml index d35de9c08..e29859152 100644 --- a/tools/ci/branches/ci_mse/.gitlab-ci.yml +++ b/tools/ci/branches/ci_mse/.gitlab-ci.yml @@ -20,7 +20,7 @@ gcc-7_tests_mse_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --enable-stldebug + - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaversegame --enable-stldebug image: i386/debian:buster <<: *job-push variables: diff --git a/tools/ci/branches/ci_mxe/.gitlab-ci.yml b/tools/ci/branches/ci_mxe/.gitlab-ci.yml index 5e7526c7a..4f29d60c4 100644 --- a/tools/ci/branches/ci_mxe/.gitlab-ci.yml +++ b/tools/ci/branches/ci_mxe/.gitlab-ci.yml @@ -24,7 +24,7 @@ mxe_gcc6_shared_32_testsbin: stage: build script: - ls /mxe - - ./tools/ci/jobs/mxe_gcc6_tests.sh --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/mxe_gcc6_tests.sh --without-manaversegame --without-dyecmd artifacts: paths: - logs @@ -43,7 +43,7 @@ mxe_gcc6_shared_64_testsbin: stage: build script: - ls /mxe - - ./tools/ci/jobs/mxe_gcc6_tests.sh --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/mxe_gcc6_tests.sh --without-manaversegame --without-dyecmd artifacts: paths: - logs diff --git a/tools/ci/branches/ci_site/.gitlab-ci.yml b/tools/ci/branches/ci_site/.gitlab-ci.yml index a5c5995b3..7ee170a19 100644 --- a/tools/ci/branches/ci_site/.gitlab-ci.yml +++ b/tools/ci/branches/ci_site/.gitlab-ci.yml @@ -35,9 +35,9 @@ gcc-6_tests_gcov: stage: build script: - ./tools/ci/scripts/clonesrc.sh - - cd manaplus + - cd manaverse - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6_tests_gcov.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc6_tests_gcov.sh --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -54,8 +54,8 @@ gcc-6_sdl2_tests_gcov: stage: build script: - ./tools/ci/scripts/clonesrc.sh - - cd manaplus - - ./tools/ci/jobs/gcc6_sdl2_tests_gcov.sh --without-dyecmd --without-manaplusgame + - cd manaverse + - ./tools/ci/jobs/gcc6_sdl2_tests_gcov.sh --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -72,7 +72,7 @@ doxygen: stage: build script: - ./tools/ci/scripts/clonesrc.sh - - cd manaplus + - cd manaverse - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/doxygen.sh artifacts: @@ -93,7 +93,7 @@ gitstats: stage: build script: - ./tools/ci/scripts/clonesrc.sh - - cd manaplus + - cd manaverse - ./tools/ci/jobs/gitstats.sh artifacts: paths: @@ -111,7 +111,7 @@ gitstatsh: stage: build script: - ./tools/ci/scripts/clonesrc.sh - - cd manaplus + - cd manaverse - ./tools/ci/jobs/gitstatsh.sh image: debian:buster artifacts: @@ -132,10 +132,10 @@ pages: stage: stats script: - rm -rf artifacts || true - - mv manaplus artifacts + - mv manaverse artifacts - ./tools/ci/scripts/clonesrc.sh - mv artifacts/* manaplus/ - - cd manaplus + - cd manaverse - ./tools/ci/jobs/pages.sh dependencies: - doxygen diff --git a/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml b/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml index b1dcf40e6..b73132224 100644 --- a/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml +++ b/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml @@ -20,7 +20,7 @@ gcc-8_pugixml_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame --enable-libxml=pugixml + - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaversegame --enable-libxml=pugixml <<: *job-push variables: PACKAGES: gcc-8 g++-8 @@ -35,7 +35,7 @@ gcc-8_pugixml_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame --enable-libxml=pugixml + - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaversegame --enable-libxml=pugixml image: i386/debian:unstable <<: *job-push variables: diff --git a/tools/ci/branches/master/.gitlab-ci.yml b/tools/ci/branches/master/.gitlab-ci.yml index 610c4dfda..60a4b6575 100644 --- a/tools/ci/branches/master/.gitlab-ci.yml +++ b/tools/ci/branches/master/.gitlab-ci.yml @@ -237,7 +237,7 @@ gcc-10_game_only: gcc-10_dyecmd_only: stage: prebuild script: - - ./tools/ci/jobs/gcc10.sh --without-manaplusgame + - ./tools/ci/jobs/gcc10.sh --without-manaversegame <<: *job-push variables: PACKAGES: gcc-10 g++-10 @@ -248,7 +248,7 @@ gcc-10_dyecmd_only: gcc-10_unittestsbin: stage: prebuild script: - - ./tools/ci/jobs/gcc10_silent.sh --enable-unittestsbin --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/gcc10_silent.sh --enable-unittestsbin --without-manaversegame --without-dyecmd <<: *job-push variables: PACKAGES: gcc-10 g++-10 @@ -330,7 +330,7 @@ triggers: - echo /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz} - export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libasan.so.5 - /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" @@ -356,7 +356,7 @@ triggers: script: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libasan.so.5 - - /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" @@ -383,7 +383,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 @@ -405,7 +405,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 @@ -430,7 +430,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 @@ -454,7 +454,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 diff --git a/tools/ci/jobs/gitstatsh.sh b/tools/ci/jobs/gitstatsh.sh index 376d31f43..e4f6dfbb9 100755 --- a/tools/ci/jobs/gitstatsh.sh +++ b/tools/ci/jobs/gitstatsh.sh @@ -13,7 +13,7 @@ check_error $? git log --stat --no-merges --summary --decorate=false >repo_log check_error $? cd gitstatsh/v1 -python main.py ManaPlus ../../repo_log +python main.py ManaVerse ../../repo_log check_error $? mv web ../../stats2 check_error $? diff --git a/tools/ci/jobs/windowstest.cmd b/tools/ci/jobs/windowstest.cmd index 5fcd9099c..25e298133 100644 --- a/tools/ci/jobs/windowstest.cmd +++ b/tools/ci/jobs/windowstest.cmd @@ -3,6 +3,6 @@ cd test mkdir %1 xcopy /s C:\gitlabrunner\%1 %1 cd %1 -copy ..\..\src\manaplustests.exe .\ +copy ..\..\src\manaversetests.exe .\ dir -manaplustests.exe +manaversetests.exe diff --git a/tools/ci/scripts/azure/mxetest.sh b/tools/ci/scripts/azure/mxetest.sh index 30cf8342e..9dd57db4f 100755 --- a/tools/ci/scripts/azure/mxetest.sh +++ b/tools/ci/scripts/azure/mxetest.sh @@ -6,7 +6,7 @@ echo docker login registry.gitlab.com -u azure -p TOKEN docker login registry.gitlab.com -u azure -p $GITLABTOKEN || exit 1 export IMAGE="registry.gitlab.com/manaplus/mxe:gcc6_shared_${BITS}" -export COMMAND="./tools/ci/jobs/mxe_gcc6_tests.sh --without-manaplusgame --without-dyecmd" +export COMMAND="./tools/ci/jobs/mxe_gcc6_tests.sh --without-manaversegame --without-dyecmd" export PACKAGES="bash" ./tools/ci/scripts/docker_run_cross.sh || exit 1 mkdir dlls || true diff --git a/tools/ci/scripts/circleci/gcc6_sanitize_tests.sh b/tools/ci/scripts/circleci/gcc6_sanitize_tests.sh index afaae9234..10dbe2351 100755 --- a/tools/ci/scripts/circleci/gcc6_sanitize_tests.sh +++ b/tools/ci/scripts/circleci/gcc6_sanitize_tests.sh @@ -6,7 +6,7 @@ echo "Current node: ${CIRCLE_NODE_INDEX}" case $CIRCLE_NODE_INDEX in 0) export IMAGE=debian:stretch - export COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=yes --without-dyecmd --without-manaplusgame --without-opengl --with-sdl2" + export COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=yes --without-dyecmd --without-manaversegame --without-opengl --with-sdl2" export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL2} valgrind" ./tools/ci/scripts/docker_run.sh ;; @@ -15,7 +15,7 @@ case $CIRCLE_NODE_INDEX in ;; 2) export IMAGE=debian:stretch - export COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=yes --without-dyecmd --without-manaplusgame --without-opengl" + export COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=yes --without-dyecmd --without-manaversegame --without-opengl" export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL1} valgrind" ./tools/ci/scripts/docker_run.sh ;; diff --git a/tools/ci/scripts/circleci/gcc6_tests.sh b/tools/ci/scripts/circleci/gcc6_tests.sh index 644f4b75f..bce1cbe49 100755 --- a/tools/ci/scripts/circleci/gcc6_tests.sh +++ b/tools/ci/scripts/circleci/gcc6_tests.sh @@ -6,25 +6,25 @@ echo "Current node: ${CIRCLE_NODE_INDEX}" case $CIRCLE_NODE_INDEX in 0) export IMAGE=i386/debian:stretch - export COMMAND="./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame --without-opengl" + export COMMAND="./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaversegame --without-opengl" export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL1} valgrind" ./tools/ci/scripts/docker_run.sh ;; 1) export IMAGE=debian:stretch - export COMMAND="./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --enable-glibcdebug --with-sdl2" + export COMMAND="./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaversegame --without-opengl --enable-glibcdebug --with-sdl2" export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL2} valgrind" ./tools/ci/scripts/docker_run.sh ;; 2) export IMAGE=i386/debian:stretch - export COMMAND="./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --enable-glibcdebug --with-sdl2" + export COMMAND="./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaversegame --without-opengl --enable-glibcdebug --with-sdl2" export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL2} valgrind" ./tools/ci/scripts/docker_run.sh ;; 3) export IMAGE=debian:stretch - export COMMAND="./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --enable-glibcdebug" + export COMMAND="./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaversegame --without-opengl --enable-glibcdebug" export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL1} valgrind" ./tools/ci/scripts/docker_run.sh ;; diff --git a/tools/ci/scripts/circleci/gcc7_sanitize_tests.sh b/tools/ci/scripts/circleci/gcc7_sanitize_tests.sh index 1b3c9a8fa..e7d243407 100755 --- a/tools/ci/scripts/circleci/gcc7_sanitize_tests.sh +++ b/tools/ci/scripts/circleci/gcc7_sanitize_tests.sh @@ -9,7 +9,7 @@ case $CIRCLE_NODE_INDEX in ;; 1) export IMAGE=debian:buster - export COMMAND="./tools/ci/jobs/gcc7_sanitize_tests.sh --enable-unittests=yes --without-dyecmd --without-manaplusgame --without-opengl" + export COMMAND="./tools/ci/jobs/gcc7_sanitize_tests.sh --enable-unittests=yes --without-dyecmd --without-manaversegame --without-opengl" export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL1} valgrind" ./tools/ci/scripts/docker_run.sh ;; @@ -18,7 +18,7 @@ case $CIRCLE_NODE_INDEX in ;; 3) export IMAGE=debian:buster - export COMMAND="./tools/ci/jobs/gcc7_sanitize_tests.sh --enable-unittests=yes --without-dyecmd --without-manaplusgame --without-opengl --with-sdl2" + export COMMAND="./tools/ci/jobs/gcc7_sanitize_tests.sh --enable-unittests=yes --without-dyecmd --without-manaversegame --without-opengl --with-sdl2" export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL2} valgrind" ./tools/ci/scripts/docker_run.sh ;; diff --git a/tools/ci/scripts/circleci/gcc7_tests.sh b/tools/ci/scripts/circleci/gcc7_tests.sh index 0acab9a7b..ff3b643d9 100755 --- a/tools/ci/scripts/circleci/gcc7_tests.sh +++ b/tools/ci/scripts/circleci/gcc7_tests.sh @@ -6,25 +6,25 @@ echo "Current node: ${CIRCLE_NODE_INDEX}" case $CIRCLE_NODE_INDEX in 0) export IMAGE=debian:buster - export COMMAND="./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --enable-glibcdebug --with-sdl2" + export COMMAND="./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaversegame --without-opengl --enable-glibcdebug --with-sdl2" export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL2} valgrind" ./tools/ci/scripts/docker_run.sh ;; 1) export IMAGE=i386/debian:buster - export COMMAND="./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --enable-glibcdebug --with-sdl2" + export COMMAND="./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaversegame --without-opengl --enable-glibcdebug --with-sdl2" export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL2} valgrind" ./tools/ci/scripts/docker_run.sh ;; 2) export IMAGE=debian:buster - export COMMAND="./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --enable-glibcdebug" + export COMMAND="./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaversegame --without-opengl --enable-glibcdebug" export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL1} valgrind" ./tools/ci/scripts/docker_run.sh ;; 3) export IMAGE=i386/debian:buster - export COMMAND="./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --without-opengl" + export COMMAND="./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaversegame --without-opengl" export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL1} valgrind" ./tools/ci/scripts/docker_run.sh ;; diff --git a/tools/ci/scripts/clonesrc.sh b/tools/ci/scripts/clonesrc.sh index efb0596d3..120d4f56b 100755 --- a/tools/ci/scripts/clonesrc.sh +++ b/tools/ci/scripts/clonesrc.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -rm -rf manaplus || true -./tools/ci/scripts/retry.sh "git clone --branch master --depth ${GIT_DEPTH} https://gitlab.com/manaplus/manaplus.git manaplus" || exit 1 +rm -rf manaverse || true +./tools/ci/scripts/retry.sh "git clone --branch master --depth ${GIT_DEPTH} https://gitlab.com/manaplus/manaplus.git manaverse" || exit 1 mkdir manaplus/logs || exit 1 diff --git a/tools/ci/scripts/init.sh b/tools/ci/scripts/init.sh index f427be910..b8d998924 100755 --- a/tools/ci/scripts/init.sh +++ b/tools/ci/scripts/init.sh @@ -277,7 +277,7 @@ function run_tarball { cd $1 echo "tar xf ../*.tar.xz" tar xf ../*.tar.xz - cd manaplus* + cd manaverse* } function run_mplint { diff --git a/tools/ci/scripts/runtest.sh b/tools/ci/scripts/runtest.sh index 7c41da5ce..bb31d5067 100755 --- a/tools/ci/scripts/runtest.sh +++ b/tools/ci/scripts/runtest.sh @@ -52,7 +52,7 @@ function wait_for_servers_list { function run { ./src/manaplus --hide-cursor --enable-ipc --renderer=0 >logs/run.log 2>&1 & export PID=$! - echo "manaplus PID: ${PID}" + echo "manaverse PID: ${PID}" sleep 20 echo "pause after run" wait_for_servers_list @@ -98,16 +98,16 @@ function send_command { } function check_exists { - if [ ! -f "logs/home/Desktop/ManaPlus/$1" ]; then + if [ ! -f "logs/home/Desktop/ManaVerse/$1" ]; then sleep 10 - if [ ! -f "logs/home/Desktop/ManaPlus/$1" ]; then + if [ ! -f "logs/home/Desktop/ManaVerse/$1" ]; then echo "Error: image $1 not exists" exit 1 fi fi - if [ ! -f "logs/home/Desktop/ManaPlus/$2" ]; then + if [ ! -f "logs/home/Desktop/ManaVerse/$2" ]; then sleep 10 - if [ ! -f "logs/home/Desktop/ManaPlus/$2" ]; then + if [ ! -f "logs/home/Desktop/ManaVerse/$2" ]; then echo "Error: image $2 not exists" exit 1 fi @@ -116,7 +116,7 @@ function check_exists { function imagesdiff { check_exists "$1" "$2" - diff "logs/home/Desktop/ManaPlus/$1" "logs/home/Desktop/ManaPlus/$2" + diff "logs/home/Desktop/ManaVerse/$1" "logs/home/Desktop/ManaVerse/$2" if [ "$?" == 0 ]; then echo "Error: images '$1' and '$2' is same." exit 1 @@ -125,7 +125,7 @@ function imagesdiff { function imagessame { check_exists "$1" "$2" - diff "logs/home/Desktop/ManaPlus/$1" "logs/home/Desktop/ManaPlus/$2" + diff "logs/home/Desktop/ManaVerse/$1" "logs/home/Desktop/ManaVerse/$2" if [ "$?" != 0 ]; then echo "Error: images '$1' and '$2' is different." exit 1 @@ -236,7 +236,7 @@ imagesdiff new_server.png about.png send_command "/sendmousekey 500 20 1" send_command "/screenshot about.png" -# open about manaplus page +# open about manaverse page send_command "/sendmousekey 300 ${ABOUTYOFFSET} 1" send_command "/screenshot about2.png" imagesdiff about.png about2.png |