summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-12-17 18:02:53 +0300
committerAndrei Karas <akaras@inbox.ru>2016-12-17 18:02:53 +0300
commiteb928ee85732d5de03d53ba29d466a8525ccf12d (patch)
treed7005534fe8adba43f622aa00ddfb380d0b96a2a
parente4bb6a1c4841c263878291915c528de77042bba5 (diff)
downloadmanaplus-eb928ee85732d5de03d53ba29d466a8525ccf12d.tar.gz
manaplus-eb928ee85732d5de03d53ba29d466a8525ccf12d.tar.bz2
manaplus-eb928ee85732d5de03d53ba29d466a8525ccf12d.tar.xz
manaplus-eb928ee85732d5de03d53ba29d466a8525ccf12d.zip
Add generic clang job script.
-rw-r--r--.gitlab-ci.yml4
-rwxr-xr-xtools/ci/jobs/clang.sh20
2 files changed, 22 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a73d1874..f701549b7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -276,7 +276,7 @@ gcc-4.8_i386:
clang-3.0:
stage: build
script:
- - ./tools/ci/jobs/clang3.sh
+ - ./tools/ci/jobs/clang.sh clang
image: debian:oldstable
<<: *log-failed-jobs
tags:
@@ -285,7 +285,7 @@ clang-3.0:
clang-3.0_i386:
stage: build
script:
- - ./tools/ci/jobs/clang3.sh
+ - ./tools/ci/jobs/clang.sh clang
image: vicamo/debian:oldstable-i386
<<: *log-failed-jobs
tags:
diff --git a/tools/ci/jobs/clang.sh b/tools/ci/jobs/clang.sh
new file mode 100755
index 000000000..ad8c95338
--- /dev/null
+++ b/tools/ci/jobs/clang.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+export CC=clang
+export CXX=clang++
+export LOGFILE=$1.log
+
+source ./tools/ci/scripts/init.sh
+
+aptget_install $1 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
+
+do_init
+run_configure --enable-werror
+run_make
+
+source ./tools/ci/scripts/exit.sh
+
+exit 0