Replace most clang 5.0 builds to clang 6.0 builds.

Add separate clang 5.0 build.

3 files changed, 99 insertions, 15 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1da11943c..af1a2e041 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1450,13 +1450,13 @@ gcc-7_tests_valgrind_i386:
   tags:
     - docker
 
-clang-5.0_tests:
+clang-6.0_tests:
   stage: build
   script:
-  - ./tools/ci/jobs/clang50_tests.sh --without-dyecmd --without-manaplusgame
+  - ./tools/ci/jobs/clang60_tests.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
   variables:
-    PACKAGES: clang-5.0 libc++-dev libc++abi-dev libclang-5.0-dev 
+    PACKAGES: clang-6.0 libc++-dev libc++abi-dev libclang-6.0-dev 
               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
@@ -1464,14 +1464,14 @@ clang-5.0_tests:
   tags:
     - docker
 
-clang-5.0_tests_i386:
+clang-6.0_tests_i386:
   stage: build
   script:
-  - ./tools/ci/jobs/clang50_tests.sh --without-dyecmd --without-manaplusgame
+  - ./tools/ci/jobs/clang60_tests.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
   image: vicamo/debian:sid-i386
   variables:
-    PACKAGES: clang-5.0 libc++-dev libc++abi-dev libclang-5.0-dev 
+    PACKAGES: clang-6.0 libc++-dev libc++abi-dev libclang-6.0-dev 
               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
@@ -1479,13 +1479,13 @@ clang-5.0_tests_i386:
   tags:
     - docker
 
-clang-5.0_tests_sdl2:
+clang-6.0_tests_sdl2:
   stage: build
   script:
-  - ./tools/ci/jobs/clang50_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame
+  - ./tools/ci/jobs/clang60_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame
   <<: *job-push
   variables:
-    PACKAGES: clang-5.0 libc++-dev libc++abi-dev libclang-5.0-dev 
+    PACKAGES: clang-6.0 libc++-dev libc++abi-dev libclang-6.0-dev 
               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
@@ -1493,14 +1493,14 @@ clang-5.0_tests_sdl2:
   tags:
     - docker
 
-clang-5.0_tests_sdl2_i386:
+clang-6.0_tests_sdl2_i386:
   stage: build
   script:
-  - ./tools/ci/jobs/clang50_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame
+  - ./tools/ci/jobs/clang60_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame
   <<: *job-push
   image: vicamo/debian:sid-i386
   variables:
-    PACKAGES: clang-5.0 libc++-dev libc++abi-dev libclang-5.0-dev 
+    PACKAGES: clang-6.0 libc++-dev libc++abi-dev libclang-6.0-dev 
               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
@@ -2583,15 +2583,30 @@ clang-5.0:
   tags:
     - docker
 
-clang-5.0_i386:
+clang-6.0:
   stage: build
   script:
-  - ./tools/ci/jobs/clang50.sh
+  - ./tools/ci/jobs/clang60.sh
+  - ./tools/ci/scripts/runtests.sh
+  <<: *job-push
+  variables:
+    PACKAGES: clang-6.0 libc++-dev libc++abi-dev libclang-6.0-dev 
+              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
+  tags:
+    - docker
+
+clang-6.0_i386:
+  stage: build
+  script:
+  - ./tools/ci/jobs/clang60.sh
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
   image: vicamo/debian:sid-i386
   variables:
-    PACKAGES: clang-5.0 libc++-dev libc++abi-dev libclang-5.0-dev 
+    PACKAGES: clang-6.0 libc++-dev libc++abi-dev libclang-6.0-dev 
               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/clang60.sh b/tools/ci/jobs/clang60.sh
new file mode 100755
index 000000000..afb58c928
--- /dev/null
+++ b/tools/ci/jobs/clang60.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+export CC=clang-6.0
+export CXX=clang++-6.0
+
+if [ "$NEWCC" != "" ]; then
+    export CC="$NEWCC"
+fi
+if [ "$NEWCXX" != "" ]; then
+    export CXX="$NEWCXX"
+fi
+
+export LOGFILE=clang60.log
+
+source ./tools/ci/scripts/init.sh
+
+# need fix -Wshadow-field
+
+export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign-conversion \
+-Wno-global-constructors -Wno-exit-time-destructors -Wno-weak-vtables \
+-Wno-overloaded-virtual -Wno-covered-switch-default -Wno-float-equal -Wno-conversion \
+-Wno-shorten-64-to-32 -Wno-missing-variable-declarations \
+-Wno-disabled-macro-expansion -Wno-format-nonliteral \
+-Wno-reserved-id-macro -Wno-packed -Wno-documentation-unknown-command \
+-Wno-variadic-macros -Wno-double-promotion -Wno-attributes -Wno-shadow-field \
+-Wpointer-bool-conversion -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS"
+
+do_init
+run_configure --enable-werror $*
+run_make
+
+source ./tools/ci/scripts/exit.sh
+
+exit 0
diff --git a/tools/ci/jobs/clang60_tests.sh b/tools/ci/jobs/clang60_tests.sh
new file mode 100755
index 000000000..065d8bfbd
--- /dev/null
+++ b/tools/ci/jobs/clang60_tests.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+export CC=clang-6.0
+export CXX=clang++-6.0
+
+if [ "$NEWCC" != "" ]; then
+    export CC="$NEWCC"
+fi
+if [ "$NEWCXX" != "" ]; then
+    export CXX="$NEWCXX"
+fi
+
+export LOGFILE=clang60.log
+
+source ./tools/ci/scripts/init.sh
+
+# need fix -Wshadow-field
+
+export CXXFLAGS="$CXXFLAGS -Weverything -Wno-documentation -Wno-padded -Wno-sign-conversion \
+-Wno-global-constructors -Wno-exit-time-destructors -Wno-weak-vtables \
+-Wno-overloaded-virtual -Wno-covered-switch-default -Wno-float-equal -Wno-conversion \
+-Wno-shorten-64-to-32 -Wno-missing-variable-declarations \
+-Wno-disabled-macro-expansion -Wno-format-nonliteral \
+-Wno-reserved-id-macro -Wno-packed -Wno-documentation-unknown-command \
+-Wno-variadic-macros -Wno-double-promotion -Wno-attributes -Wno-shadow-field \
+-Wpointer-bool-conversion -fno-omit-frame-pointer -ggdb3 $POST_CXXFLAGS"
+
+do_init
+run_configure --enable-unittests=yes $*
+export SDL_VIDEODRIVER=dummy
+run_make_check
+
+source ./tools/ci/scripts/exit.sh
+
+exit 0