summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2020-05-30 02:51:15 +0300
committerAndrei Karas <akaras@inbox.ru>2020-05-30 02:51:15 +0300
commit72f50e92edfafc687dec815e92501839d7702f96 (patch)
treeedc80edc73bdb34985ac2bf9e307027e35b04552
parent1b82b409e90e29c96c92f30bdd21b229a4f7ad22 (diff)
downloadmv-72f50e92edfafc687dec815e92501839d7702f96.tar.gz
mv-72f50e92edfafc687dec815e92501839d7702f96.tar.bz2
mv-72f50e92edfafc687dec815e92501839d7702f96.tar.xz
mv-72f50e92edfafc687dec815e92501839d7702f96.zip
Rename gcc-7 to gcc-10 in .gitlab-ci.yml
-rw-r--r--.gitlab-ci.yml92
1 files changed, 46 insertions, 46 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cfb7ba73c..e9582727a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -77,17 +77,17 @@ gcc-8-i386:
tags:
- docker
-gcc-7-i386:
+gcc-10-i386:
stage: prebuild
script:
- ./tools/ci/scripts/patchsdl1.sh
- - ./tools/ci/jobs/gcc7.sh
+ - ./tools/ci/jobs/gcc10.sh
- ./tools/ci/scripts/runtests.sh
- ./tools/ci/scripts/rundyecmd.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
@@ -162,7 +162,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/scripts/patchsdl1.sh
@@ -172,10 +172,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
@@ -224,29 +224,29 @@ 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/scripts/patchsdl1.sh
- - ./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/scripts/patchsdl1.sh
- - ./tools/ci/jobs/gcc7.sh --without-manaplusgame
+ - ./tools/ci/jobs/gcc10.sh --without-manaplusgame
- ./tools/ci/scripts/rundyecmd.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
@@ -333,14 +333,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.4
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} env
- - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/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"
@@ -348,7 +348,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
@@ -361,12 +361,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.4
- - /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"
@@ -374,7 +374,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
@@ -387,20 +387,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
@@ -411,18 +411,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
@@ -434,20 +434,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
@@ -460,18 +460,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
@@ -484,19 +484,19 @@ triggers:
- docker
# error compilation. cant find SDL.
-.gcc-7_zlib_ng_develop:
+.gcc-10_zlib_ng_develop:
stage: build
script:
- ./tools/ci/scripts/patchsdl1.sh
- ./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
@@ -505,20 +505,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
@@ -529,18 +529,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
@@ -552,20 +552,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
@@ -578,18 +578,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