summaryrefslogtreecommitdiff
path: root/tools/ci
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2020-05-30 03:15:26 +0300
committerAndrei Karas <akaras@inbox.ru>2020-05-30 03:15:26 +0300
commitf9345c97b78ee8d3fec6294042769061202b9f53 (patch)
treef4d2a187319eb700588f5a2ffc1643dffd15218d /tools/ci
parent9cad74335eed6f7e1f5dde17c46077975f8fb571 (diff)
downloadplus-f9345c97b78ee8d3fec6294042769061202b9f53.tar.gz
plus-f9345c97b78ee8d3fec6294042769061202b9f53.tar.bz2
plus-f9345c97b78ee8d3fec6294042769061202b9f53.tar.xz
plus-f9345c97b78ee8d3fec6294042769061202b9f53.zip
Replace gcc-7 to gcc-10 in ci branches ci_main1 and ci_mse
Diffstat (limited to 'tools/ci')
-rw-r--r--tools/ci/branches/ci_main1/.gitlab-ci.yml24
-rw-r--r--tools/ci/branches/ci_mse/.gitlab-ci.yml30
2 files changed, 27 insertions, 27 deletions
diff --git a/tools/ci/branches/ci_main1/.gitlab-ci.yml b/tools/ci/branches/ci_main1/.gitlab-ci.yml
index e15dac278..d2e1b3608 100644
--- a/tools/ci/branches/ci_main1/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_main1/.gitlab-ci.yml
@@ -17,16 +17,16 @@
dependencies: []
# crash in config tests
-.gcc-7_sanitize_i386:
+.gcc-10_sanitize_i386:
stage: build
script:
- ./tools/ci/scripts/patchsdl1.sh
- - ./tools/ci/jobs/gcc7_sanitize.sh
+ - ./tools/ci/jobs/gcc10_sanitize.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
@@ -35,15 +35,15 @@
tags:
- docker
-gcc-7_sanitize:
+gcc-10_sanitize:
stage: build
script:
- ./tools/ci/scripts/patchsdl1.sh
- - ./tools/ci/jobs/gcc7_sanitize.sh
+ - ./tools/ci/jobs/gcc10_sanitize.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
@@ -51,31 +51,31 @@ gcc-7_sanitize:
tags:
- docker
-gcc-7_lto:
+gcc-10_lto:
stage: build
script:
- ./tools/ci/scripts/patchsdl1.sh
- - ./tools/ci/jobs/gcc7_lto.sh
+ - ./tools/ci/jobs/gcc10_lto.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
git gdb valgrind netcat-openbsd procps
POST_CXXFLAGS: "-Wno-null-dereference"
-gcc-7_lto_i386:
+gcc-10_lto_i386:
stage: build
script:
- ./tools/ci/scripts/patchsdl1.sh
- - ./tools/ci/jobs/gcc7_lto.sh
+ - ./tools/ci/jobs/gcc10_lto.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
diff --git a/tools/ci/branches/ci_mse/.gitlab-ci.yml b/tools/ci/branches/ci_mse/.gitlab-ci.yml
index a75fefb83..9759c432a 100644
--- a/tools/ci/branches/ci_mse/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_mse/.gitlab-ci.yml
@@ -16,15 +16,15 @@
expire_in: 3 week
dependencies: []
-gcc-7_tests_mse_i386:
+gcc-10_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/gcc10_tests.sh --without-dyecmd --without-manaplusgame --enable-stldebug
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
@@ -32,57 +32,57 @@ gcc-7_tests_mse_i386:
tags:
- docker
-gcc-7_mse:
+gcc-10_mse:
stage: build
script:
- ./tools/ci/scripts/patchsdl1.sh
- - ./tools/ci/jobs/gcc7.sh --enable-stldebug --without-dyecmd
+ - ./tools/ci/jobs/gcc10.sh --enable-stldebug --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
git gdb valgrind netcat-openbsd procps
-gcc-7_mse_i386:
+gcc-10_mse_i386:
stage: build
script:
- ./tools/ci/scripts/patchsdl1.sh
- - ./tools/ci/jobs/gcc7.sh --enable-stldebug --without-dyecmd
+ - ./tools/ci/jobs/gcc10.sh --enable-stldebug --without-dyecmd
- ./tools/ci/scripts/runtests.sh
<<: *job-push
image: i386/debian:unstable
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
git gdb valgrind netcat-openbsd procps
-gcc-7_mse_sdl2:
+gcc-10_mse_sdl2:
stage: build
script:
- - ./tools/ci/jobs/gcc7.sh --with-sdl2 --enable-stldebug --without-dyecmd
+ - ./tools/ci/jobs/gcc10.sh --with-sdl2 --enable-stldebug --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
libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev
git gdb valgrind netcat-openbsd procps
-gcc-7_mse_sdl2_i386:
+gcc-10_mse_sdl2_i386:
stage: build
script:
- - ./tools/ci/jobs/gcc7.sh --with-sdl2 --enable-stldebug --without-dyecmd
+ - ./tools/ci/jobs/gcc10.sh --with-sdl2 --enable-stldebug --without-dyecmd
- ./tools/ci/scripts/runtests.sh
<<: *job-push
image: i386/debian:unstable
variables:
- PACKAGES: gcc-7 g++-7
+ PACKAGES: gcc-10 g++-10
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