5 files changed, 60 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e1e2a85..dad14cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,6 +15,18 @@ gcc-5:
   - ./tools/ci/jobs/gcc5.sh --enable-werror
   image: debian:unstable
 
+gcc-6:
+  stage: build
+  script:
+  - ./tools/ci/jobs/gcc6.sh --enable-werror
+  image: debian:unstable
+
+clang-3.9:
+  stage: build
+  script:
+  - ./tools/ci/jobs/clang39.sh --enable-werror
+  image: debian:unstable
+
 # tests
 
 plugin-validator:
diff --git a/tools/ci/jobs/clang39.sh b/tools/ci/jobs/clang39.sh
new file mode 100755
index 0000000..baf2db1
--- /dev/null
+++ b/tools/ci/jobs/clang39.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+export CC=clang-3.9
+export CXX=clang++-3.9
+export LOGFILE=gcc6.log
+
+source ./tools/ci/scripts/init.sh
+
+aptget_install clang-3.9 \
+    git-core \
+    make autoconf automake autopoint \
+    libtool libmysqlclient-dev libz-dev libpcre3-dev
+
+do_init
+build_init
+
+run_configure $*
+run_make
diff --git a/tools/ci/jobs/gcc5.sh b/tools/ci/jobs/gcc5.sh
index fca932c..5dcbe2a 100755
--- a/tools/ci/jobs/gcc5.sh
+++ b/tools/ci/jobs/gcc5.sh
@@ -6,21 +6,13 @@ export LOGFILE=gcc5.log
 
 source ./tools/ci/scripts/init.sh
 
-aptget_install gcc-5 g++-5 \
+aptget_install gcc-5 \
     git-core \
     make autoconf automake autopoint \
     libtool libmysqlclient-dev libz-dev libpcre3-dev
 
 do_init
-clone_servercode
-mkdir server-code/src/evol
-mkdir -p server-data/plugins
-cp -r evol-hercules/* server-code/src/evol/
-check_error $?
-cd server-code/src/evol
-check_error $?
+build_init
 
-ls -la
-ls -la ..
 run_configure $*
 run_make
diff --git a/tools/ci/jobs/gcc6.sh b/tools/ci/jobs/gcc6.sh
new file mode 100755
index 0000000..34cf845
--- /dev/null
+++ b/tools/ci/jobs/gcc6.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+export CC=gcc-6
+export CXX=g++-6
+export LOGFILE=gcc6.log
+
+source ./tools/ci/scripts/init.sh
+
+aptget_install gcc-6 \
+    git-core \
+    make autoconf automake autopoint \
+    libtool libmysqlclient-dev libz-dev libpcre3-dev
+
+do_init
+build_init
+
+run_configure $*
+run_make
diff --git a/tools/ci/scripts/init.sh b/tools/ci/scripts/init.sh
index 15645bb..2edc758 100755
--- a/tools/ci/scripts/init.sh
+++ b/tools/ci/scripts/init.sh
@@ -141,4 +141,14 @@ function clone_servercode {
     gitclone https://gitlab.com/evol/hercules.git server-code
 }
 
+function build_init {
+    clone_servercode
+    mkdir server-code/src/evol
+    mkdir -p server-data/plugins
+    cp -r evol-hercules/* server-code/src/evol/
+    check_error $?
+    cd server-code/src/evol
+    check_error $?
+}
+
 aptget_update