Add some gcc-8 builds into .gitlab-ci.yml

10 files changed, 18 insertions, 18 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2db63b774..832246882 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,15 +59,15 @@ gcc-5_c++11_i386:
   tags:
     - docker
 
-gcc-6-i386:
+gcc-8-i386:
   stage: prebuild
   script:
-  - ./tools/ci/jobs/gcc6.sh
+  - ./tools/ci/jobs/gcc8.sh
   - ./tools/ci/scripts/runtests.sh
   image: vicamo/debian:sid-i386
   <<: *job-push
   variables:
-    PACKAGES: gcc-6 g++-6 
+    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
@@ -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-8:
   stage: prebuild
   script:
-  - ./tools/ci/jobs/gcc7.sh
+  - ./tools/ci/jobs/gcc8.sh
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
   variables:
-    PACKAGES: gcc-7 g++-7 
+    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
@@ -229,13 +229,13 @@ gcc-7_dyecmd_only:
               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-8_unittestsbin:
   stage: prebuild
   script:
-  - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin --without-manaplusgame --without-dyecmd
+  - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin --without-manaplusgame --without-dyecmd
   <<: *job-push
   variables:
-    PACKAGES: gcc-7 g++-7 
+    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
diff --git a/tools/ci/jobs/gcc8.sh b/tools/ci/jobs/gcc8.sh
index 7abe10f09..d7adc4794 100755
--- a/tools/ci/jobs/gcc8.sh
+++ b/tools/ci/jobs/gcc8.sh
@@ -16,7 +16,7 @@ source ./tools/ci/scripts/init.sh
 
 export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
 -Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \
--std=gnu++1z -Wformat=1 \
+-std=gnu++2a -Wformat=1 \
 -Wno-attributes -fno-omit-frame-pointer"
 
 source ./tools/ci/flags/gcc8.sh
diff --git a/tools/ci/jobs/gcc8_lto.sh b/tools/ci/jobs/gcc8_lto.sh
index 981538c60..05442106a 100755
--- a/tools/ci/jobs/gcc8_lto.sh
+++ b/tools/ci/jobs/gcc8_lto.sh
@@ -15,7 +15,7 @@ export LOGFILE=gcc8.log
 source ./tools/ci/scripts/init.sh
 
 export CXXFLAGS="$CXXFLAGS -ggdb3 -pipe -ffast-math -O9 -flto -fwhole-program \
--fno-omit-frame-pointer -funswitch-loops -D_FORTIFY_SOURCE=2 -std=gnu++1z \
+-fno-omit-frame-pointer -funswitch-loops -D_FORTIFY_SOURCE=2 -std=gnu++2a \
 -Wno-attributes -fno-omit-frame-pointer"
 
 source ./tools/ci/flags/gcc8.sh
diff --git a/tools/ci/jobs/gcc8_sanitize.sh b/tools/ci/jobs/gcc8_sanitize.sh
index f4143e4b7..dca481380 100755
--- a/tools/ci/jobs/gcc8_sanitize.sh
+++ b/tools/ci/jobs/gcc8_sanitize.sh
@@ -26,7 +26,7 @@ export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
 -fsanitize=leak \
 -fsanitize=shift-exponent -fsanitize=shift-base -fsanitize=bounds-strict \
 -fsanitize-address-use-after-scope \
--std=gnu++1z -Wformat=1 \
+-std=gnu++2a -Wformat=1 \
 -Wno-attributes -fno-omit-frame-pointer"
 
 source ./tools/ci/flags/gcc8.sh
diff --git a/tools/ci/jobs/gcc8_sanitize_tests.sh b/tools/ci/jobs/gcc8_sanitize_tests.sh
index e28cabe97..7bd2002f8 100755
--- a/tools/ci/jobs/gcc8_sanitize_tests.sh
+++ b/tools/ci/jobs/gcc8_sanitize_tests.sh
@@ -27,7 +27,7 @@ export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -Wstrict-aliasing=2 \
 -fsanitize=leak \
 -fsanitize=shift-exponent -fsanitize=shift-base -fsanitize=bounds-strict \
 -fsanitize-address-use-after-scope \
--std=gnu++1z -Wformat=1 \
+-std=gnu++2a -Wformat=1 \
 -Wno-attributes"
 
 #source ./tools/ci/flags/gcc8.sh
diff --git a/tools/ci/jobs/gcc8_sdl2_tests_gcov.sh b/tools/ci/jobs/gcc8_sdl2_tests_gcov.sh
index 23912b771..b26594f58 100755
--- a/tools/ci/jobs/gcc8_sdl2_tests_gcov.sh
+++ b/tools/ci/jobs/gcc8_sdl2_tests_gcov.sh
@@ -16,7 +16,7 @@ source ./tools/ci/scripts/init.sh
 
 export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
 -Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \
--std=gnu++1z -Wformat=1 \
+-std=gnu++2a -Wformat=1 \
 -Wno-attributes"
 
 source ./tools/ci/flags/gcc8.sh
diff --git a/tools/ci/jobs/gcc8_silent.sh b/tools/ci/jobs/gcc8_silent.sh
index be3f272dc..10366cb76 100755
--- a/tools/ci/jobs/gcc8_silent.sh
+++ b/tools/ci/jobs/gcc8_silent.sh
@@ -16,7 +16,7 @@ source ./tools/ci/scripts/init.sh
 
 export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
 -Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \
--std=gnu++1z -Wformat=1 \
+-std=gnu++2a -Wformat=1 \
 -Wno-attributes -fno-omit-frame-pointer"
 
 source ./tools/ci/flags/gcc8.sh
diff --git a/tools/ci/jobs/gcc8_tests.sh b/tools/ci/jobs/gcc8_tests.sh
index ef8aebd40..9f8ebed35 100755
--- a/tools/ci/jobs/gcc8_tests.sh
+++ b/tools/ci/jobs/gcc8_tests.sh
@@ -16,7 +16,7 @@ source ./tools/ci/scripts/init.sh
 
 export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
 -Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \
--std=gnu++1z -Wformat=1 \
+-std=gnu++2a -Wformat=1 \
 -Wno-attributes"
 
 source ./tools/ci/flags/gcc8.sh
diff --git a/tools/ci/jobs/gcc8_tests_gcov.sh b/tools/ci/jobs/gcc8_tests_gcov.sh
index cc3606676..b639d2bbe 100755
--- a/tools/ci/jobs/gcc8_tests_gcov.sh
+++ b/tools/ci/jobs/gcc8_tests_gcov.sh
@@ -16,7 +16,7 @@ source ./tools/ci/scripts/init.sh
 
 export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
 -Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \
--std=gnu++1z -Wformat=1 \
+-std=gnu++2a -Wformat=1 \
 -Wno-attributes"
 
 source ./tools/ci/flags/gcc8.sh
diff --git a/tools/ci/jobs/gcc8_tests_simd.sh b/tools/ci/jobs/gcc8_tests_simd.sh
index 9c82afb7c..5985cd29e 100755
--- a/tools/ci/jobs/gcc8_tests_simd.sh
+++ b/tools/ci/jobs/gcc8_tests_simd.sh
@@ -21,7 +21,7 @@ export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O5 -pipe -Wstrict-aliasing=2 \
 -ffast-math -funswitch-loops \
 -funsafe-loop-optimizations \
 -march=native -fsched-pressure
--std=gnu++1z -Wformat=1 \
+-std=gnu++2a -Wformat=1 \
 -fno-var-tracking -Wno-attributes"
 
 source ./tools/ci/flags/gcc8.sh