From 9cad74335eed6f7e1f5dde17c46077975f8fb571 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 30 May 2020 02:54:12 +0300 Subject: Switch docket image in gcc-7 ci builds in branches --- tools/ci/branches/ci_gcc7/.gitlab-ci.yml | 10 +-- tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml | 14 ++-- tools/ci/branches/master/.gitlab-ci.yml | 104 ++++++++++++------------- 3 files changed, 64 insertions(+), 64 deletions(-) (limited to 'tools') diff --git a/tools/ci/branches/ci_gcc7/.gitlab-ci.yml b/tools/ci/branches/ci_gcc7/.gitlab-ci.yml index b8b7737ec..0cb5a54ea 100644 --- a/tools/ci/branches/ci_gcc7/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc7/.gitlab-ci.yml @@ -22,7 +22,7 @@ gcc-7-i386: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc7.sh - ./tools/ci/scripts/runtests.sh - image: i386/debian:unstable + image: i386/debian:buster <<: *job-push variables: PACKAGES: gcc-7 g++-7 @@ -66,7 +66,7 @@ gcc-7_sdl2_i386: - ./tools/ci/jobs/gcc7.sh --with-sdl2 - ./tools/ci/scripts/runtests.sh <<: *job-push - image: i386/debian:unstable + image: i386/debian:buster variables: PACKAGES: gcc-7 g++-7 make autoconf automake autopoint gettext @@ -115,7 +115,7 @@ gcc-7_sanitize: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc7_sanitize.sh - ./tools/ci/scripts/runtests.sh - image: i386/debian:unstable + image: i386/debian:buster <<: *job-push variables: PACKAGES: gcc-7 g++-7 @@ -162,7 +162,7 @@ gcc-7_lto_i386: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc7_lto.sh - ./tools/ci/scripts/runtests.sh - image: i386/debian:unstable + image: i386/debian:buster <<: *job-push variables: PACKAGES: gcc-7 g++-7 @@ -181,7 +181,7 @@ gcc-7_default_i386: - ./tools/ci/jobs/any_compiler.sh --enable-werror - ./tools/ci/scripts/runtests.sh <<: *job-push - image: i386/debian:unstable + image: i386/debian:buster variables: LOGFILE: gcc7.log CC: gcc-7 diff --git a/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml index 65659af71..3b5f88e6c 100644 --- a/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml @@ -38,7 +38,7 @@ gcc-7_doctest_tests_i386: script: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc7_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame - image: i386/debian:unstable + image: i386/debian:buster <<: *job-push variables: PACKAGES: gcc-7 g++-7 @@ -119,7 +119,7 @@ gcc-7_tests_lto_i386: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame <<: *job-push - image: i386/debian:unstable + image: i386/debian:buster variables: POST_CXXFLAGS: "-ffast-math -O9 -flto -fwhole-program -funswitch-loops" PACKAGES: gcc-7 g++-7 @@ -135,7 +135,7 @@ gcc-7_tests_i386: script: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame - image: i386/debian:unstable + image: i386/debian:buster <<: *job-push variables: PACKAGES: gcc-7 g++-7 @@ -181,7 +181,7 @@ gcc-7_sdl2_tests_i386: stage: build script: - ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame - image: i386/debian:unstable + image: i386/debian:buster <<: *job-push variables: PACKAGES: gcc-7 g++-7 @@ -218,7 +218,7 @@ gcc-7_sdl2_tests_i386: - 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 - image: i386/debian:unstable + image: i386/debian:buster <<: *job-push variables: PACKAGES: gcc-7 g++-7 @@ -301,7 +301,7 @@ gcc-7_separate_doctest_i386: - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd - ./tools/ci/scripts/separateunittests.sh <<: *job-push - image: i386/debian:unstable + image: i386/debian:buster variables: PACKAGES: gcc-7 g++-7 make autoconf automake autopoint gettext @@ -317,7 +317,7 @@ gcc-7_separate_doctest_sdl2_i386: - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd --with-sdl2 - ./tools/ci/scripts/separateunittests.sh <<: *job-push - image: i386/debian:unstable + image: i386/debian:buster variables: PACKAGES: gcc-7 g++-7 make autoconf automake autopoint gettext diff --git a/tools/ci/branches/master/.gitlab-ci.yml b/tools/ci/branches/master/.gitlab-ci.yml index 1e7d01378..c523d7b9a 100644 --- a/tools/ci/branches/master/.gitlab-ci.yml +++ b/tools/ci/branches/master/.gitlab-ci.yml @@ -75,15 +75,15 @@ gcc-6-i386: tags: - docker -gcc-7-i386: +gcc-10-i386: stage: prebuild script: - - ./tools/ci/jobs/gcc7.sh + - ./tools/ci/jobs/gcc10.sh - ./tools/ci/scripts/runtests.sh image: i386/debian:unstable <<: *job-push variables: - PACKAGES: gcc-7 g++-7 + PACKAGES: gcc-10 g++-10 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 @@ -117,14 +117,14 @@ gcc-6: libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev gdb valgrind netcat-openbsd procps -gcc-7: +gcc-10: stage: prebuild script: - - ./tools/ci/jobs/gcc7.sh + - ./tools/ci/jobs/gcc10.sh - ./tools/ci/scripts/runtests.sh <<: *job-push variables: - PACKAGES: gcc-7 g++-7 + PACKAGES: gcc-10 g++-10 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 @@ -147,7 +147,7 @@ gcc-6_default: libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev gdb valgrind netcat-openbsd procps -gcc-7_default: +gcc-10_default: stage: prebuild script: - ./tools/ci/jobs/any_compiler.sh --enable-werror @@ -155,10 +155,10 @@ gcc-7_default: <<: *job-push variables: LOGFILE: gcc6.log - CC: gcc-7 - CXX: g++-7 + CC: gcc-10 + CXX: g++-10 CXXFLAGS: "-Wall -Wextra" - PACKAGES: gcc-7 g++-7 + PACKAGES: gcc-10 g++-10 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 @@ -205,37 +205,37 @@ gcc-5_sdl2: libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev gdb valgrind netcat-openbsd procps -gcc-7_game_only: +gcc-10_game_only: stage: prebuild script: - - ./tools/ci/jobs/gcc7.sh --without-dyecmd + - ./tools/ci/jobs/gcc10.sh --without-dyecmd - ./tools/ci/scripts/runtests.sh <<: *job-push variables: - PACKAGES: gcc-7 g++-7 + PACKAGES: gcc-10 g++-10 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 gdb valgrind netcat-openbsd procps -gcc-7_dyecmd_only: +gcc-10_dyecmd_only: stage: prebuild script: - - ./tools/ci/jobs/gcc7.sh --without-manaplusgame + - ./tools/ci/jobs/gcc10.sh --without-manaplusgame <<: *job-push variables: - PACKAGES: gcc-7 g++-7 + PACKAGES: gcc-10 g++-10 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 -gcc-7_unittestsbin: +gcc-10_unittestsbin: stage: prebuild script: - - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/gcc10_silent.sh --enable-unittestsbin --without-manaplusgame --without-dyecmd <<: *job-push variables: - PACKAGES: gcc-7 g++-7 + PACKAGES: gcc-10 g++-10 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 @@ -307,14 +307,14 @@ triggers: # disabled due gitlab bug -.gcc-7_SDL_SDL-1.2_sanitize2_test: +.gcc-10_SDL_SDL-1.2_sanitize2_test: stage: build script: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - 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/gcc7_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-manaplusgame --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" @@ -322,7 +322,7 @@ triggers: variables: LIBNAME: SDL LIBVERSION: SDL-1.2_asan - PACKAGES: gcc-7 g++-7 + PACKAGES: gcc-10 g++-10 make autoconf automake autopoint gettext pkg-config libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev valgrind @@ -335,12 +335,12 @@ triggers: - docker # disabled due gitlab bug -.gcc-7_SDL_default_sanitize2_test: +.gcc-10_SDL_default_sanitize2_test: stage: build 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/gcc7_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-manaplusgame --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" @@ -348,7 +348,7 @@ triggers: variables: LIBNAME: SDL LIBVERSION: default_asan - PACKAGES: gcc-7 g++-7 + PACKAGES: gcc-10 g++-10 make autoconf automake autopoint gettext pkg-config libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libicu-dev valgrind @@ -361,20 +361,20 @@ triggers: - docker # disabled due gitlab bug -.gcc-7_SDL_SDL-1.2_sanitize_test: +.gcc-10_SDL_SDL-1.2_sanitize_test: stage: build script: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - echo /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} env - - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_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-manaplusgame --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 variables: LIBNAME: SDL LIBVERSION: SDL-1.2 - PACKAGES: gcc-7 g++-7 + PACKAGES: gcc-10 g++-10 make autoconf automake autopoint gettext pkg-config libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev valgrind @@ -385,18 +385,18 @@ triggers: - docker # disabled due gitlab bug -.gcc-7_SDL_default_sanitize_test: +.gcc-10_SDL_default_sanitize_test: stage: build script: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_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-manaplusgame --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 variables: LIBNAME: SDL LIBVERSION: default - PACKAGES: gcc-7 g++-7 + PACKAGES: gcc-10 g++-10 make autoconf automake autopoint gettext pkg-config libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libicu-dev valgrind @@ -408,20 +408,20 @@ triggers: # disabled due gitlab bug -.gcc-7_SDL_SDL-1.2_old_sanitize_test: +.gcc-10_SDL_SDL-1.2_old_sanitize_test: stage: build script: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - echo /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} env - - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_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-manaplusgame --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 variables: LIBNAME: SDL LIBVERSION: SDL-1.2_old - PACKAGES: gcc-7 g++-7 + PACKAGES: gcc-10 g++-10 make autoconf automake autopoint gettext pkg-config libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev valgrind @@ -434,18 +434,18 @@ triggers: - docker # disabled due gitlab bug -.gcc-7_SDL_default_old_sanitize_test: +.gcc-10_SDL_default_old_sanitize_test: stage: build script: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_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-manaplusgame --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 variables: LIBNAME: SDL LIBVERSION: default_old - PACKAGES: gcc-7 g++-7 + PACKAGES: gcc-10 g++-10 make autoconf automake autopoint gettext pkg-config libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libicu-dev valgrind @@ -458,18 +458,18 @@ triggers: - docker # error compilation. cant find SDL. -.gcc-7_zlib_ng_develop: +.gcc-10_zlib_ng_develop: stage: build script: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc7.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc10.sh - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/checkldd.sh src/manaplus - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh <<: *job-push variables: LIBNAME: zlib_ng LIBVERSION: develop - PACKAGES: gcc-7 g++-7 + PACKAGES: gcc-10 g++-10 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 @@ -478,20 +478,20 @@ triggers: - docker # disabled due gitlab bug -.gcc-7_SDL_SDL-1.2_sanitize: +.gcc-10_SDL_SDL-1.2_sanitize: stage: build script: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - echo /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} env - - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_sanitize.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize.sh - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh - ldd ./src/manaplus | grep "libasan" <<: *job-push variables: LIBNAME: SDL LIBVERSION: SDL-1.2 - PACKAGES: gcc-7 g++-7 + PACKAGES: gcc-10 g++-10 make autoconf automake autopoint gettext pkg-config libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev valgrind netcat-openbsd @@ -502,18 +502,18 @@ triggers: - docker # disabled due gitlab bug -.gcc-7_SDL_default_sanitize: +.gcc-10_SDL_default_sanitize: stage: build script: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_sanitize.sh --with-sdl2 + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize.sh --with-sdl2 - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh - ldd ./src/manaplus | grep "libasan" <<: *job-push variables: LIBNAME: SDL LIBVERSION: default - PACKAGES: gcc-7 g++-7 + PACKAGES: gcc-10 g++-10 make autoconf automake autopoint gettext pkg-config libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libicu-dev valgrind netcat-openbsd @@ -525,20 +525,20 @@ triggers: # disabled due gitlab bug -.gcc-7_SDL_SDL-1.2_old_sanitize: +.gcc-10_SDL_SDL-1.2_old_sanitize: stage: build script: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - echo /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} env - - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_sanitize.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize.sh - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh - ldd ./src/manaplus | grep "libasan" <<: *job-push variables: LIBNAME: SDL LIBVERSION: SDL-1.2_old - PACKAGES: gcc-7 g++-7 + PACKAGES: gcc-10 g++-10 make autoconf automake autopoint gettext pkg-config libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev valgrind netcat-openbsd @@ -551,18 +551,18 @@ triggers: - docker # disabled due gitlab bug -.gcc-7_SDL_default_old_sanitize: +.gcc-10_SDL_default_old_sanitize: stage: build script: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_sanitize.sh --with-sdl2 + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize.sh --with-sdl2 - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh - ldd ./src/manaplus | grep "libasan" <<: *job-push variables: LIBNAME: SDL LIBVERSION: default_old - PACKAGES: gcc-7 g++-7 + PACKAGES: gcc-10 g++-10 make autoconf automake autopoint gettext pkg-config libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libicu-dev valgrind netcat-openbsd -- cgit v1.2.3-70-g09d2