From 68f2bfcadd044840dbd42b8fd114a41588019f09 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 17 Dec 2016 22:14:53 +0300
Subject: Add missing clang versions into ci tests.

---
 .gitlab-ci.yml           | 72 ++++++++++++++++++++++++++++++++++++++++++++++++
 tools/ci/jobs/clang33.sh | 22 +++++++++++++++
 tools/ci/jobs/clang36.sh | 22 +++++++++++++++
 tools/ci/jobs/clang37.sh | 22 +++++++++++++++
 tools/ci/jobs/clang38.sh | 29 +++++++++++++++++++
 5 files changed, 167 insertions(+)
 create mode 100755 tools/ci/jobs/clang33.sh
 create mode 100755 tools/ci/jobs/clang36.sh
 create mode 100755 tools/ci/jobs/clang37.sh
 create mode 100755 tools/ci/jobs/clang38.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f701549b7..a1240b7d1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -291,6 +291,24 @@ clang-3.0_i386:
   tags:
     - docker
 
+clang-3.3:
+  stage: build
+  script:
+  - ./tools/ci/jobs/clang.sh clang-3.3
+  image: ubuntu:12.04
+  <<: *log-failed-jobs
+  tags:
+    - docker
+
+clang-3.3_i386:
+  stage: build
+  script:
+  - ./tools/ci/jobs/clang.sh clang-3.3
+  image: vicamo/ubuntu:precise-i386
+  <<: *log-failed-jobs
+  tags:
+    - docker
+
 clang-3.4:
   stage: build
   script:
@@ -323,6 +341,60 @@ clang-3.5_i386:
   tags:
     - docker
 
+clang-3.6:
+  stage: build
+  script:
+  - ./tools/ci/jobs/clang36.sh
+  image: ubuntu:14.04
+  <<: *log-failed-jobs
+  tags:
+    - docker
+
+clang-3.6_i386:
+  stage: build
+  script:
+  - ./tools/ci/jobs/clang36.sh
+  image: vicamo/ubuntu:trusty-i386
+  <<: *log-failed-jobs
+  tags:
+    - docker
+
+clang-3.7:
+  stage: build
+  script:
+  - ./tools/ci/jobs/clang37.sh
+  image: ubuntu:16.04
+  <<: *log-failed-jobs
+  tags:
+    - docker
+
+clang-3.7_i386:
+  stage: build
+  script:
+  - ./tools/ci/jobs/clang37.sh
+  image: vicamo/ubuntu:xenial-i386
+  <<: *log-failed-jobs
+  tags:
+    - docker
+
+clang-3.8:
+  stage: build
+  script:
+  - ./tools/ci/jobs/clang38.sh
+  image: ubuntu:16.04
+  <<: *log-failed-jobs
+  tags:
+    - docker
+
+clang-3.8_i386:
+  stage: build
+  script:
+  - ./tools/ci/jobs/clang38.sh
+  image: vicamo/ubuntu:xenial-i386
+  <<: *log-failed-jobs
+  tags:
+    - docker
+
 .clang-3.9_c++11:
   stage: build
   script:
diff --git a/tools/ci/jobs/clang33.sh b/tools/ci/jobs/clang33.sh
new file mode 100755
index 000000000..fe28ff40e
--- /dev/null
+++ b/tools/ci/jobs/clang33.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+export CC=clang-3.3
+export CXX=clang++-3.3
+export LOGFILE=clang33.log
+
+source ./tools/ci/scripts/init.sh
+
+aptget_install clang-3.3 libc++-dev \
+    make autoconf automake autopoint gettext libphysfs-dev \
+    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
+
+export CXXFLAGS="-stdlib=libc++"
+
+do_init
+run_configure --enable-werror
+run_make
+
+source ./tools/ci/scripts/exit.sh
+
+exit 0
diff --git a/tools/ci/jobs/clang36.sh b/tools/ci/jobs/clang36.sh
new file mode 100755
index 000000000..db46fe154
--- /dev/null
+++ b/tools/ci/jobs/clang36.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+export CC=clang-3.6
+export CXX=clang++-3.6
+export LOGFILE=clang36.log
+
+source ./tools/ci/scripts/init.sh
+
+aptget_install clang-3.6 libc++-dev \
+    make autoconf automake autopoint gettext libphysfs-dev \
+    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
+
+export CXXFLAGS="-stdlib=libc++"
+
+do_init
+run_configure --enable-werror
+run_make
+
+source ./tools/ci/scripts/exit.sh
+
+exit 0
diff --git a/tools/ci/jobs/clang37.sh b/tools/ci/jobs/clang37.sh
new file mode 100755
index 000000000..48a964b14
--- /dev/null
+++ b/tools/ci/jobs/clang37.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+export CC=clang-3.7
+export CXX=clang++-3.7
+export LOGFILE=clang37.log
+
+source ./tools/ci/scripts/init.sh
+
+aptget_install clang-3.7 libc++-dev \
+    make autoconf automake autopoint gettext libphysfs-dev \
+    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
+
+export CXXFLAGS="-stdlib=libc++"
+
+do_init
+run_configure --enable-werror
+run_make
+
+source ./tools/ci/scripts/exit.sh
+
+exit 0
diff --git a/tools/ci/jobs/clang38.sh b/tools/ci/jobs/clang38.sh
new file mode 100755
index 000000000..5399f4b27
--- /dev/null
+++ b/tools/ci/jobs/clang38.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+export CC=clang-3.8
+export CXX=clang++-3.8
+export LOGFILE=clang38.log
+
+source ./tools/ci/scripts/init.sh
+
+aptget_install clang-3.8 libc++-dev libc++abi-dev \
+    make autoconf automake autopoint gettext libphysfs-dev \
+    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
+
+export 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 -stdlib=libc++ \
+-Wno-reserved-id-macro -Wno-packed -Wno-documentation-unknown-command \
+-Wno-variadic-macros -Wno-double-promotion \
+-Wpointer-bool-conversion"
+
+do_init
+run_configure --enable-werror $*
+run_make
+
+source ./tools/ci/scripts/exit.sh
+
+exit 0
-- 
cgit v1.2.3-70-g09d2