diff options
Diffstat (limited to 'tools')
36 files changed, 305 insertions, 281 deletions
diff --git a/tools/ci/branches/ci_clang6/.gitlab-ci.yml b/tools/ci/branches/ci_clang6/.gitlab-ci.yml index 0ec29486d..d4ff597cb 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-gameclient <<: *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-gameclient <<: *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-gameclient <<: *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-gameclient <<: *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..1763337b1 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-gameclient <<: *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-gameclient <<: *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-gameclient <<: *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-gameclient <<: *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..d6a8c7b44 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-gameclient - 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-gameclient - 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-gameclient <<: *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-gameclient <<: *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..57ef7311e 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-gameclient - 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-gameclient - 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-gameclient 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-gameclient <<: *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-gameclient <<: *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-gameclient <<: *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-gameclient <<: *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-gameclient <<: *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-gameclient 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-gameclient --enable-glibcdebug + - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-gameclient --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-gameclient <<: *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-gameclient 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-gameclient || 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-gameclient || 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-gameclient --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-gameclient --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-gameclient --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-gameclient --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-gameclient --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-gameclient <<: *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-gameclient <<: *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-gameclient <<: *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-gameclient <<: *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..5bb100707 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-gameclient 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-gameclient --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..4173c2060 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-gameclient - 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-gameclient - 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-gameclient - 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-gameclient 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-gameclient --enable-glibcdebug + - ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-gameclient --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-gameclient 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-gameclient 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-gameclient 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..c7b82a9aa 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-gameclient - 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-gameclient 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-gameclient 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-gameclient 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-gameclient <<: *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-gameclient 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-gameclient 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-gameclient --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-gameclient --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-gameclient 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-gameclient 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-gameclient || 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-gameclient || 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-gameclient 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..f3504aef3 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-gameclient - 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-gameclient 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-gameclient 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-gameclient 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-gameclient 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-gameclient 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-gameclient <<: *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-gameclient 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-gameclient --enable-glibcdebug + - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-gameclient --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-gameclient 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-gameclient 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-gameclient || 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-gameclient || 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-gameclient --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-gameclient --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-gameclient --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-gameclient --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-gameclient --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-gameclient 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-gameclient 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..a39b9ebc5 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-gameclient - 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-gameclient - 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-gameclient 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-gameclient <<: *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-gameclient <<: *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-gameclient <<: *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-gameclient <<: *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-gameclient <<: *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-gameclient 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-gameclient --enable-glibcdebug + - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-gameclient --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-gameclient <<: *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-gameclient 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-gameclient || 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-gameclient || 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-gameclient --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-gameclient --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-gameclient --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-gameclient --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-gameclient --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-gameclient <<: *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-gameclient <<: *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-gameclient <<: *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-gameclient <<: *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..401ba0ae0 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-gameclient - 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-gameclient - 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-gameclient 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-gameclient <<: *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-gameclient <<: *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-gameclient <<: *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-gameclient <<: *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-gameclient <<: *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-gameclient 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-gameclient --enable-glibcdebug + - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-gameclient --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-gameclient <<: *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-gameclient 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-gameclient || 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-gameclient || 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-gameclient --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-gameclient --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-gameclient --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-gameclient --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-gameclient --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-gameclient <<: *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-gameclient <<: *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-gameclient <<: *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-gameclient <<: *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..1952a8ec1 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-gameclient --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-gameclient --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-gameclient --enable-glibcdebug <<: *job-push image: debian:buster variables: diff --git a/tools/ci/branches/ci_h/.gitlab-ci.yml b/tools/ci/branches/ci_h/.gitlab-ci.yml index 87eb88666..7054d42d6 100644 --- a/tools/ci/branches/ci_h/.gitlab-ci.yml +++ b/tools/ci/branches/ci_h/.gitlab-ci.yml @@ -18,11 +18,11 @@ gcc-5_h_all: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_LIBXML -I/usr/include/SDL - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -I/usr/include/SDL - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -I/usr/include/SDL - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_LIBXML -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL <<: *job-push image: ubuntu:xenial variables: @@ -36,11 +36,11 @@ gcc-5_h_all_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_LIBXML -I/usr/include/SDL - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -I/usr/include/SDL - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -I/usr/include/SDL - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_LIBXML -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL image: i386/ubuntu:xenial <<: *job-push variables: @@ -56,11 +56,11 @@ gcc-5_h_pugi_all: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_PUGIXML -I/usr/include/SDL - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_PUGIXML -I/usr/include/SDL - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_PUGIXML -I/usr/include/SDL - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_PUGIXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -I/usr/include/SDL - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_PUGIXML -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_PUGIXML -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_PUGIXML -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_PUGIXML -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_PUGIXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_PUGIXML -I/usr/include/SDL image: ubuntu:xenial <<: *job-push variables: @@ -74,11 +74,11 @@ gcc-5_h_tinyxml2_all: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_TINYXML2 -I/usr/include/SDL - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_TINYXML2 -I/usr/include/SDL - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_TINYXML2 -I/usr/include/SDL - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_TINYXML2 -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -I/usr/include/SDL - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_TINYXML2 -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_TINYXML2 -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_TINYXML2 -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_TINYXML2 -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_TINYXML2 -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_TINYXML2 -I/usr/include/SDL image: ubuntu:xenial <<: *job-push variables: @@ -91,10 +91,10 @@ gcc-5_h_tinyxml2_all: gcc-5_h_sdl2: stage: build script: - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2 - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2 - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2 - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -DUSE_SDL2 -I/usr/include/SDL2 + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2 + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2 + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2 + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -DUSE_SDL2 -I/usr/include/SDL2 image: ubuntu:xenial <<: *job-push variables: @@ -107,10 +107,10 @@ gcc-5_h_sdl2: gcc-5_h_sdl2_i386: stage: build script: - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2 - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2 - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2 - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -DUSE_SDL2 -I/usr/include/SDL2 + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2 + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2 + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -DUSE_SDL2 -I/usr/include/SDL2 + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -DUSE_SDL2 -I/usr/include/SDL2 image: i386/ubuntu:xenial <<: *job-push variables: diff --git a/tools/ci/branches/ci_main1/.gitlab-ci.yml b/tools/ci/branches/ci_main1/.gitlab-ci.yml index 27ecc3655..021934447 100644 --- a/tools/ci/branches/ci_main1/.gitlab-ci.yml +++ b/tools/ci/branches/ci_main1/.gitlab-ci.yml @@ -253,31 +253,3 @@ gcc-8_unsigned_char_sdl2: libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev git gdb valgrind netcat-openbsd procps POST_CXXFLAGS: "-funsigned-char" - -gcc-8_password: - stage: build - script: - - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8.sh --enable-commandlinepassword - - ./tools/ci/scripts/runtests.sh - <<: *job-push - variables: - PACKAGES: gcc-8 g++-8 - make autoconf automake autopoint gettext - libxml2-dev libcurl4-gnutls-dev libpng-dev - libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev - git gdb valgrind netcat-openbsd procps - -gcc-8_password_sdl2: - stage: build - script: - - ./tools/ci/jobs/gcc8.sh --enable-commandlinepassword --with-sdl2 - - ./tools/ci/scripts/runtests.sh - <<: *job-push - variables: - ABOUTYOFFSET: 380 - PACKAGES: gcc-8 g++-8 - make autoconf automake autopoint gettext - libxml2-dev libcurl4-gnutls-dev libpng-dev - libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev - git gdb valgrind netcat-openbsd procps diff --git a/tools/ci/branches/ci_malloc/.gitlab-ci.yml b/tools/ci/branches/ci_malloc/.gitlab-ci.yml index ace0f93a3..bfa969317 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-gameclient <<: *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-gameclient <<: *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-gameclient <<: *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-gameclient <<: *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-gameclient <<: *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-gameclient <<: *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-gameclient <<: *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-gameclient <<: *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..3f347f003 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-gameclient --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..a0d64cdcf 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-gameclient --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-gameclient --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..66fbe53d4 100644 --- a/tools/ci/branches/ci_site/.gitlab-ci.yml +++ b/tools/ci/branches/ci_site/.gitlab-ci.yml @@ -37,7 +37,7 @@ gcc-6_tests_gcov: - ./tools/ci/scripts/clonesrc.sh - cd manaplus - ./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-gameclient <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -55,7 +55,7 @@ gcc-6_sdl2_tests_gcov: script: - ./tools/ci/scripts/clonesrc.sh - cd manaplus - - ./tools/ci/jobs/gcc6_sdl2_tests_gcov.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc6_sdl2_tests_gcov.sh --without-dyecmd --without-gameclient <<: *job-push variables: PACKAGES: gcc-6 g++-6 diff --git a/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml b/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml index b1dcf40e6..ad0e743f8 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-gameclient --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-gameclient --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..7c560cfc4 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-gameclient <<: *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-gameclient --without-dyecmd <<: *job-push variables: PACKAGES: gcc-10 g++-10 @@ -281,11 +281,11 @@ linters: gcc-5_h_all: stage: prebuild script: - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_LIBXML -I/usr/include/SDL - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -I/usr/include/SDL - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -I/usr/include/SDL - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_LIBXML -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -296,11 +296,11 @@ gcc-5_h_all: gcc-5_h_all_i386: stage: prebuild script: - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_LIBXML -I/usr/include/SDL - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -I/usr/include/SDL - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -I/usr/include/SDL - - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_LIBXML -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++11 -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL image: i386/debian:unstable <<: *job-push variables: @@ -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-gameclient --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-gameclient --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-gameclient --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-gameclient --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-gameclient --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-gameclient --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/cpplint.sh b/tools/ci/jobs/cpplint.sh index 7bbccf271..b8331ff29 100755 --- a/tools/ci/jobs/cpplint.sh +++ b/tools/ci/jobs/cpplint.sh @@ -1,14 +1,21 @@ #!/usr/bin/env bash -export LOGFILE=cpplint.log +set -e # Fail if any command fails +set -u # Fail if any variable is unset when used +export LOGFILE=cpplint.log source ./tools/ci/scripts/init.sh # Re-download if not executable or older than a day if [[ ! -x cpplint.py \ || $(find cpplint.py -mtime 1 -print) ]]; then - tools/ci/scripts/retry.sh wget "https://raw.githubusercontent.com/google/styleguide/gh-pages/cpplint/cpplint.py" - chmod +x cpplint.py + #tools/ci/scripts/retry.sh wget "https://raw.githubusercontent.com/google/styleguide/gh-pages/cpplint/cpplint.py" + # Google no longer offers their cpplint and suggests using the following one, instead: + tools/ci/scripts/retry.sh wget "https://raw.githubusercontent.com/cpplint/cpplint/refs/tags/2.0.0/cpplint.py" + chmod +x cpplint.py + + # env python -> env python3 + sed -i -s -e '1s/python$/python3/' cpplint.py fi declare -a args @@ -40,19 +47,20 @@ args+=("--filter=\ -build/c++tr1"\ ) +# Cannot find a good way to handle execution errors +# (such cpplint.py demanding a version of Python that does not exist) +# So use || true here and assume any other problems will be exposed +# by the grep below. Addendum: no more grep. YMMV. find src \ -type f \ - -name "*.cpp" -o -name "*.hpp" -o -name "*.h" -o -name "*.cc" \ - -exec ./cpplint.py "${args[@]}" {} \+ 2>${ERRFILE}2 + \( -name "*.cc" \ + -o \( -name "*.cpp" -a \! -path src/debug/nvwa/debug_new.cpp \) \ + -o \( -name "*.h" -a \! -path src/unittests/doctest.h \) \ + -o \( -name "*.hpp" -a \! -path src/unittests/catch.hpp \) \ + \) -exec ./cpplint.py --verbose=5 "${args[@]}" {} \+ 2>"$ERRFILE" + #|| true -grep ": " ${ERRFILE}2 | grep -v -e "src/debug/" \ - -e "unittests/doctest.h" \ - -e "unittests/catch.hpp" \ - -e "debug/fast_mutex" \ - -e "sdl2gfx/SDL2" \ - >${ERRFILE} -rm ${ERRFILE}2 run_check_warnings diff --git a/tools/ci/jobs/gcc47_c++11.sh b/tools/ci/jobs/gcc47_c++11.sh index 3860ee79e..b93a03b7b 100755 --- a/tools/ci/jobs/gcc47_c++11.sh +++ b/tools/ci/jobs/gcc47_c++11.sh @@ -16,7 +16,6 @@ source ./tools/ci/scripts/init.sh export CXXFLAGS="$CXXFLAGS -ggdb3 -O2 -pipe -ffast-math \ -funswitch-loops \ --std=c++0x \ -fno-omit-frame-pointer $POST_CXXFLAGS" do_init diff --git a/tools/ci/jobs/gcc48_c++11.sh b/tools/ci/jobs/gcc48_c++11.sh index 9652f1fc1..c6030ea22 100755 --- a/tools/ci/jobs/gcc48_c++11.sh +++ b/tools/ci/jobs/gcc48_c++11.sh @@ -31,7 +31,7 @@ export CXXFLAGS="$CXXFLAGS -ggdb3 -O2 -pipe -ffast-math \ -Wwrite-strings -Wstack-protector -Wshadow -Wunused-macros -Wsynth \ -Wbuiltin-macro-redefined -Wctor-dtor-privacy -Wdeprecated \ -Wendif-labels -Wformat=1 -Wimport -Wnon-virtual-dtor -Wpsabi \ --Wsign-promo -Wwrite-strings -D_FORTIFY_SOURCE=2 -Wc++11-compat -std=c++0x \ +-Wsign-promo -Wwrite-strings -D_FORTIFY_SOURCE=2 -Wc++17-compat -std=c++11 \ -Wdelete-non-virtual-dtor -Wmaybe-uninitialized -Wunused-local-typedefs \ -Wvector-operation-performance -Wfree-nonheap-object -Winvalid-memory-model \ -Wnarrowing -Wzero-as-null-pointer-constant -funsafe-loop-optimizations \ diff --git a/tools/ci/jobs/gcc49_c++11.sh b/tools/ci/jobs/gcc49_c++11.sh index e9ecdc154..09c161367 100755 --- a/tools/ci/jobs/gcc49_c++11.sh +++ b/tools/ci/jobs/gcc49_c++11.sh @@ -30,7 +30,7 @@ export CXXFLAGS="$CXXFLAGS -ggdb3 -O2 -pipe -ffast-math \ -Wwrite-strings -Wstack-protector -Wshadow -Wunused-macros -Wsynth \ -Wbuiltin-macro-redefined -Wctor-dtor-privacy -Wdeprecated \ -Wendif-labels -Wformat=1 -Wimport -Wnon-virtual-dtor -Wpsabi \ --Wsign-promo -Wwrite-strings -D_FORTIFY_SOURCE=2 -Wc++11-compat -std=c++0x \ +-Wsign-promo -Wwrite-strings -D_FORTIFY_SOURCE=2 -Wc++17-compat -std=c++11 \ -Wdelete-non-virtual-dtor -Wmaybe-uninitialized -Wunused-local-typedefs \ -Wvector-operation-performance -Wfree-nonheap-object -Winvalid-memory-model \ -Wnarrowing -Wzero-as-null-pointer-constant -funsafe-loop-optimizations \ diff --git a/tools/ci/jobs/gcc49_sanitize.sh b/tools/ci/jobs/gcc49_sanitize.sh index f9ae60711..3c22f7e21 100755 --- a/tools/ci/jobs/gcc49_sanitize.sh +++ b/tools/ci/jobs/gcc49_sanitize.sh @@ -32,7 +32,7 @@ export CXXFLAGS="$CXXFLAGS -ggdb3 -O2 -ffast-math \ -Wwrite-strings -Wstack-protector -Wshadow -Wunused-macros -Wsynth \ -Wbuiltin-macro-redefined -Wctor-dtor-privacy -Wdeprecated \ -Wendif-labels -Wformat=1 -Wimport -Wnon-virtual-dtor -Wpsabi \ --Wsign-promo -Wwrite-strings -D_FORTIFY_SOURCE=2 -Wc++11-compat -std=c++0x \ +-Wsign-promo -Wwrite-strings -D_FORTIFY_SOURCE=2 -Wc++17-compat -std=c++11 \ -Wdelete-non-virtual-dtor -Wmaybe-uninitialized -Wunused-local-typedefs \ -Wvector-operation-performance -Wfree-nonheap-object -Winvalid-memory-model \ -Wnarrowing -Wzero-as-null-pointer-constant -funsafe-loop-optimizations \ diff --git a/tools/ci/jobs/gcc49_sanitize_tests.sh b/tools/ci/jobs/gcc49_sanitize_tests.sh index 787022b13..2432dc02d 100755 --- a/tools/ci/jobs/gcc49_sanitize_tests.sh +++ b/tools/ci/jobs/gcc49_sanitize_tests.sh @@ -32,7 +32,7 @@ export CXXFLAGS="$CXXFLAGS -ggdb3 -O2 -ffast-math \ -Wwrite-strings -Wstack-protector -Wshadow -Wunused-macros -Wsynth \ -Wbuiltin-macro-redefined -Wctor-dtor-privacy -Wdeprecated \ -Wendif-labels -Wformat=1 -Wimport -Wnon-virtual-dtor -Wpsabi \ --Wsign-promo -Wwrite-strings -D_FORTIFY_SOURCE=2 -Wc++11-compat -std=c++0x \ +-Wsign-promo -Wwrite-strings -D_FORTIFY_SOURCE=2 -Wc++17-compat -std=c++11 \ -Wdelete-non-virtual-dtor -Wmaybe-uninitialized -Wunused-local-typedefs \ -Wvector-operation-performance -Wfree-nonheap-object -Winvalid-memory-model \ -Wnarrowing -Wzero-as-null-pointer-constant -funsafe-loop-optimizations \ diff --git a/tools/ci/jobs/nsiqcppstyle.sh b/tools/ci/jobs/nsiqcppstyle.sh index fd9f0499a..e83c8e932 100755 --- a/tools/ci/jobs/nsiqcppstyle.sh +++ b/tools/ci/jobs/nsiqcppstyle.sh @@ -1,19 +1,25 @@ #!/usr/bin/env bash -export LOGFILE=nsiqcppstyle.log +set -e # Fail if any command fails +set -u # Fail if any variable is unset when used +export LOGFILE=nsiqcppstyle.log source ./tools/ci/scripts/init.sh rm -rf nsiqcppstyle.git ./tools/ci/scripts/retry.sh git clone https://gitlab.com/4144/nsiqcppstyle nsiqcppstyle.git +# replace python -> python2 on line3. (Explicitly call python2) +sed -i -s -e '3s/^python/python2/' ./nsiqcppstyle.git/nsiqcppstyle + ./nsiqcppstyle.git/nsiqcppstyle --ci --show-url src \ | grep -v -e "catch.hpp" \ -e "doctest.h" \ -e "sdl2gfx" \ -e "/debug/" \ - > logs/nsiqcppstyle1.log + > "$ERRFILE_UNFILTERED" +# If grep does not find any messages, it exits non-zero. Therefore, use ||true grep -v -E \ -e "gamemodifiers[.]cpp(.+): Incorrect align on long parameter list in front of '(N_|{|})'" \ -e "graphics_calcImageRect[.]hpp(.+): function [(]calcTileVertexesInline[)] has non named parameter" \ @@ -23,10 +29,8 @@ grep -v -E \ -e "windowmenu[.]cpp(.+): Incorrect align on long parameter list in front of '(.|Visible_true)', it should be aligen in column 15" \ -e "channeltab[.]h(.+): Incorrect align on long parameter list in front of 'const'" \ -e "/enums/simpletypes/(.+): function [(]defIntEnum[)] has non named parameter" \ - logs/nsiqcppstyle1.log > "${ERRFILE}" + "$ERRFILE_UNFILTERED" > "$ERRFILE" || true + +run_check_warnings -if [[ -s "${ERRFILE}" ]]; then - echo "Warnings detected" - cat ${ERRFILE} - exit 1 -fi +echo ok diff --git a/tools/ci/jobs/potfiles_update_check.sh b/tools/ci/jobs/potfiles_update_check.sh new file mode 100755 index 000000000..6610d4332 --- /dev/null +++ b/tools/ci/jobs/potfiles_update_check.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env bash + +set -e # Fail if any command fails +set -u # Fail if any variable is unset when used + +export LOGFILE=potfiles.log +source ./tools/ci/scripts/init.sh + +./po/POTgen.sh + +# error if POTgen applied any changes +git diff >> "$ERRFILE" + +# Save in-progress work in case someone runs this script manually. +#git stash push -m "POTgen run" +# Restore repository back to original state for other ci jobs. +#git reset --hard + +run_check_warnings + +echo ok diff --git a/tools/ci/scripts/azure/mxetest.sh b/tools/ci/scripts/azure/mxetest.sh index 30cf8342e..5745b69a0 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-gameclient --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..2f0d5684c 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-gameclient --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-gameclient --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..d15a7dad9 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-gameclient --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-gameclient --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-gameclient --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-gameclient --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..c6b9e9e05 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-gameclient --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-gameclient --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..dae8188fc 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-gameclient --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-gameclient --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-gameclient --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-gameclient --without-opengl" export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL1} valgrind" ./tools/ci/scripts/docker_run.sh ;; diff --git a/tools/ci/scripts/init.sh b/tools/ci/scripts/init.sh index ed25a59e8..396dae182 100755 --- a/tools/ci/scripts/init.sh +++ b/tools/ci/scripts/init.sh @@ -2,8 +2,10 @@ export dir=$(pwd) export ERRFILE=${dir}/logs/${LOGFILE} +export ERRFILE_UNFILTERED=${ERRFILE%.log}.unfiltered.log rm -f "$ERRFILE" +rm -f "$ERRFILE_UNFILTERED" function do_init { $CC --version @@ -150,6 +152,16 @@ function run_make { echo "make -j${JOBS} V=0 $*" make -j${JOBS} V=0 $* 2>$ERRFILE check_error $? + + for path in "src/manaplus" "src/dyecmd"; do + if [[ -f "$path" ]]; then + stat -c '%s %n' "$path" + strip -o "$path.stripped" "$path" + stat -c '%s %n' "$path.stripped" + else + printf "%s does not exist, no strip & exe size summary\n" "$path" + fi + done } function run_make_check { @@ -205,9 +217,15 @@ function run_gcov { function run_check_warnings { if [[ -s "$ERRFILE" ]]; then + printf "Warnings detected in %s:\n" "$ERRFILE" cat $ERRFILE exit 1 fi + + if [[ -s "$ERRFILE_UNFILTERED" ]]; then + printf "Warnings detected in %s. The maintainer might want to take a peek, sometimes.\n" \ + "$ERRFILE_UNFILTERED" + fi } function run_h { diff --git a/tools/ci/scripts/runtest.sh b/tools/ci/scripts/runtest.sh index e629fc514..622e04da0 100755 --- a/tools/ci/scripts/runtest.sh +++ b/tools/ci/scripts/runtest.sh @@ -18,7 +18,7 @@ function check_is_run { } function check_assert { - grep -A 20 "Assert:" "${HOME}/.local/share/mana/manaplus.log" + grep -A 20 "Assert:" "${HOME}/.local/share/mana/manaverse.log" if [ "$?" == 0 ]; then echo "Assert found in log" exit 1 @@ -31,9 +31,9 @@ function wait_for_servers_list { echo "wait for servers list ${n}" check_is_run # check here - grep "Skipping servers list update" "${HOME}/.local/share/mana/manaplus.log" && return - grep "Servers list updated" "${HOME}/.local/share/mana/manaplus.log" && return - grep "Error: servers list updating error" "${HOME}/.local/share/mana/manaplus.log" + grep "Skipping servers list update" "${HOME}/.local/share/mana/manaverse.log" && return + grep "Servers list updated" "${HOME}/.local/share/mana/manaverse.log" && return + grep "Error: servers list updating error" "${HOME}/.local/share/mana/manaverse.log" if [ "$?" == 0 ]; then echo "Servers list downloading error" exit 1 diff --git a/tools/ci/scripts/runtests.sh b/tools/ci/scripts/runtests.sh index 1263521f9..1afe5815f 100755 --- a/tools/ci/scripts/runtests.sh +++ b/tools/ci/scripts/runtests.sh @@ -26,8 +26,8 @@ while true; do rm "/root/.config/mana/mana/config.xml" rm "${HOME}/.config/mana/mana/serverlistplus.xml" rm "/root/.config/mana/mana/serverlistplus.xml" - rm "${HOME}/.local/share/mana/manaplus.log" - rm "/root/.local/share/mana/manaplus.log" + rm "${HOME}/.local/share/mana/manaverse.log" + rm "/root/.local/share/mana/manaverse.log" ./tools/ci/scripts/runtest.sh if [ "$?" != 0 ]; then exit 1 @@ -45,8 +45,8 @@ echo "existing config runs" n=0 while true; do echo "run test ${n}" - rm "${HOME}/.local/share/mana/manaplus.log" - rm "/root/.local/share/mana/manaplus.log" + rm "${HOME}/.local/share/mana/manaverse.log" + rm "/root/.local/share/mana/manaverse.log" ./tools/ci/scripts/runtest.sh if [ "$?" != 0 ]; then exit 1 diff --git a/tools/update-copyright.sh b/tools/update-copyright.sh index 4df05c030..3eb813b6f 100755 --- a/tools/update-copyright.sh +++ b/tools/update-copyright.sh @@ -2,7 +2,7 @@ # Copyright (C) 2001-2010 Wormux Team. # Copyright (C) 2010 The ManaWorld Development Team. # Copyright (C) 2012-2016 The ManaPlus Developers. -# Copyright (C) 2021-2023 The ManaVerse Developers. +# Copyright (C) 2021-2025 The ManaVerse Developers. cd .. if [[ $1 != "" ]]; then @@ -13,18 +13,20 @@ fi [[ ! -e src ]] && echo "This script should be ran from the top manaverse dirs ./tools/ path." && exit 2 -tmp_file="w$RANDOM$RANDOM$RANDOM$RANDOM" -[[ -e $tmp_file ]] && tmp_file="w$RANDOM$RANDOM$RANDOM$RANDOM" - # update the dates, creating the interval if it doesn't exist yet -find -iname "*.cpp" -or -iname "*.h" -or -iname "*.hpp" -or -iname "*.inc" -or -iname "*.cc" | - xargs sed -i "/Copyright.*The ManaVerse Developers/ s,\(20[0-9]*\) \|\(20[0-9]*\)-20[0-9]* ,\1\2-$new_year ," +# N.B: without the type f check, sed replaces symlinks with regular files +find -type f -a \ + \( -iname "*.cpp" \ + -or -iname "*.cc" \ + -or -iname "*.h" \ + -or -iname "*.hpp" \ + -or -iname "*.in" \ + -or -iname "*.inc" \ + -or -iname "*.sh" \ + -or -iname "*.txt" \ + \) -execdir sed -i "/Copyright.*The ManaVerse Developers/ s,\(20[0-9]*\) \|\(20[0-9]*\)-20[0-9]* ,\1\2-$new_year ," {} \+ +printf "The next +/- counts mentioning copyright lines should match:\n" +printf "If they do not, then try finding the offending files with grep -rl <\$bad_line>\n" # do a semi-automated commit check -git diff > $tmp_file -echo "The next +/- counts mentioning copyrights should match:" -grep "^[-+][^-+]" $tmp_file | sort | uniq -c -echo "If they don't, try finding the offending files with grep -rl <\$bad_line>" - -# Remove temp file -[[ -e $tmp_file ]] && rm $tmp_file +git diff | grep "^[-+][^-+]" | sort | uniq -c |