summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-12-09 21:19:16 +0000
committerJesusaves <cpntb1@ymail.com>2020-12-09 21:19:16 +0000
commite0e991c65d867a481baf488a8ac2b2388f5321ed (patch)
tree3fe39a097cb8b8353a2894390ac3543a01177f89
parentd7bc6893cf2f3d237c413aa9b573a2c80cd1cd53 (diff)
parent38d906da1236de67f9f26de203c019be4ed704dd (diff)
downloadevol-hercules-e0e991c65d867a481baf488a8ac2b2388f5321ed.tar.gz
evol-hercules-e0e991c65d867a481baf488a8ac2b2388f5321ed.tar.bz2
evol-hercules-e0e991c65d867a481baf488a8ac2b2388f5321ed.tar.xz
evol-hercules-e0e991c65d867a481baf488a8ac2b2388f5321ed.zip
Merge branch 'master' into 'master'
disabled broken clang-8 added clang-10 See merge request evol/evol-hercules!32
-rw-r--r--.gitlab-ci.yml17
-rwxr-xr-xtools/ci/jobs/clang10.sh18
2 files changed, 33 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c2cca1..8b32ee8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -116,18 +116,31 @@ clang-3.9:
- ./tools/ci/jobs/clang7.sh --enable-werror
image: i386/debian:unstable
-clang-8:
+.clang-8:
stage: build
script:
- ./tools/ci/jobs/clang8.sh --enable-werror
image: debian:unstable
-clang-8-i386:
+.clang-8-i386:
stage: build
script:
- ./tools/ci/jobs/clang8.sh --enable-werror
image: i386/debian:unstable
+clang-10:
+ stage: build
+ script:
+ - ./tools/ci/jobs/clang10.sh --enable-werror
+ image: debian:unstable
+
+clang-10-i386:
+ stage: build
+ script:
+ - ./tools/ci/jobs/clang10.sh --enable-werror
+ image: i386/debian:unstable
+
+
# tests
gcc-snapshot_lto-sanitize:
diff --git a/tools/ci/jobs/clang10.sh b/tools/ci/jobs/clang10.sh
new file mode 100755
index 0000000..df894ae
--- /dev/null
+++ b/tools/ci/jobs/clang10.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+export CC=clang-10
+export CXX=clang++-10
+export LOGFILE=clang10.log
+
+source ./tools/ci/scripts/init.sh
+
+aptget_install clang-10 \
+ git-core \
+ make autoconf automake autopoint \
+ libtool libmysqlclient-dev libz-dev libpcre3-dev
+
+do_init
+build_init
+
+run_configure $*
+run_make