summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-03-31 03:06:56 +0300
committerAndrei Karas <akaras@inbox.ru>2017-03-31 03:14:17 +0300
commit87481cea2fd6b5b2a9acffa919b49867c9829475 (patch)
tree95899cca3fb14a1143299529c2dbd8e4ef4ea81b
parent024bdff674c30e559c03767c383349b340b5a9c6 (diff)
downloadmanaplus-87481cea2fd6b5b2a9acffa919b49867c9829475.tar.gz
manaplus-87481cea2fd6b5b2a9acffa919b49867c9829475.tar.bz2
manaplus-87481cea2fd6b5b2a9acffa919b49867c9829475.tar.xz
manaplus-87481cea2fd6b5b2a9acffa919b49867c9829475.zip
Add build job with all normal targets with enabled unitestsbin.
-rw-r--r--.gitlab-ci.yml11
-rwxr-xr-xtools/ci/jobs/gcc6_silent.sh32
2 files changed, 43 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 08a35ea56..ba599a687 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -211,6 +211,17 @@ gcc-6_dyecmd_only:
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
+gcc-6_all_and_unittestsbin:
+ stage: prebuild
+ script:
+ - ./tools/ci/jobs/gcc6_silent.sh --enable-unittestsbin
+ <<: *job-shared
+ variables:
+ 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
+
mplint_po:
stage: prebuild
script:
diff --git a/tools/ci/jobs/gcc6_silent.sh b/tools/ci/jobs/gcc6_silent.sh
new file mode 100755
index 000000000..aa4c10fdd
--- /dev/null
+++ b/tools/ci/jobs/gcc6_silent.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+export CC=gcc-6
+export CXX=g++-6
+
+if [ "$NEWCC" != "" ]; then
+ export CC="$NEWCC"
+fi
+if [ "$NEWCXX" != "" ]; then
+ export CXX="$NEWCXX"
+fi
+
+export LOGFILE=gcc6.log
+
+source ./tools/ci/scripts/init.sh
+
+export CXXFLAGS="$CXXFLAGS -pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \
+-Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \
+-std=gnu++1z -Wformat=1 \
+-Wno-attributes"
+
+source ./tools/ci/flags/gcc6.sh
+
+export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS"
+
+do_init
+run_configure $*
+run_make
+
+source ./tools/ci/scripts/exit.sh
+
+exit 0