From 9dc3d09dd336f46ce988a41eeaed4c7f229d25cc Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 19 May 2017 18:49:11 +0300
Subject: Add gcc 5 and gcc 6 builds with only -Wall -Wextra flags.

---
 .gitlab-ci.yml                | 74 +++++++++++++++++++++++++++++++++++++++++++
 tools/ci/jobs/any_compiler.sh | 18 +++++++++++
 2 files changed, 92 insertions(+)
 create mode 100755 tools/ci/jobs/any_compiler.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index df7f262ad..184cd6c3c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -121,6 +121,23 @@ 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
 
+gcc-6_default:
+  stage: prebuild
+  script:
+  - ./tools/ci/jobs/any_compiler.sh --enable-werror
+  - ./tools/ci/scripts/runtests.sh
+  <<: *job-push
+  variables:
+    LOGFILE: gcc6.log
+    CC: gcc-6
+    CXX: g++-6
+    CXXFLAGS: "-Wall -Wextra"
+    PACKAGES: gcc-6 g++-6 
+              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
+
 gcc-4.4:
   stage: prebuild
   script:
@@ -1937,6 +1954,63 @@ gcc-4.9_sdl2:
               libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev
               gdb valgrind netcat-openbsd
 
+gcc-6_default_i386:
+  stage: build
+  script:
+  - ./tools/ci/jobs/any_compiler.sh --enable-werror
+  - ./tools/ci/scripts/runtests.sh
+  <<: *job-push
+  image: vicamo/debian:sid-i386
+  variables:
+    LOGFILE: gcc6.log
+    CC: gcc-6
+    CXX: g++-6
+    CXXFLAGS: "-Wall -Wextra"
+    PACKAGES: gcc-6 g++-6 
+              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
+  tags:
+    - docker
+
+gcc-5_default:
+  stage: build
+  script:
+  - ./tools/ci/jobs/any_compiler.sh --enable-werror
+  - ./tools/ci/scripts/runtests.sh
+  <<: *job-push
+  variables:
+    LOGFILE: gcc5.log
+    CC: gcc-5
+    CXX: g++-5
+    CXXFLAGS: "-Wall -Wextra"
+    PACKAGES: gcc-5 g++-5 
+              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
+
+gcc-5_default_i386:
+  stage: build
+  script:
+  - ./tools/ci/jobs/any_compiler.sh --enable-werror
+  - ./tools/ci/scripts/runtests.sh
+  <<: *job-push
+  image: vicamo/debian:sid-i386
+  variables:
+    LOGFILE: gcc5.log
+    CC: gcc-5
+    CXX: g++-5
+    CXXFLAGS: "-Wall -Wextra"
+    PACKAGES: gcc-5 g++-5 
+              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
+  tags:
+    - docker
+
 gcc-5_h_eathena_tmwa:
   stage: build
   script:
diff --git a/tools/ci/jobs/any_compiler.sh b/tools/ci/jobs/any_compiler.sh
new file mode 100755
index 000000000..d3e9c5082
--- /dev/null
+++ b/tools/ci/jobs/any_compiler.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+if [ "$NEWCC" != "" ]; then
+    export CC="$NEWCC"
+fi
+if [ "$NEWCXX" != "" ]; then
+    export CXX="$NEWCXX"
+fi
+
+source ./tools/ci/scripts/init.sh
+
+do_init
+run_configure $*
+run_make
+
+source ./tools/ci/scripts/exit.sh
+
+exit 0
-- 
cgit v1.2.3-60-g2f50