summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x.ci/ci-linux-build.sh35
-rw-r--r--.travis.yml4
2 files changed, 32 insertions, 7 deletions
diff --git a/.ci/ci-linux-build.sh b/.ci/ci-linux-build.sh
index 5472495b5a..a48d0788a1 100755
--- a/.ci/ci-linux-build.sh
+++ b/.ci/ci-linux-build.sh
@@ -1,10 +1,33 @@
1#!/bin/sh 1#!/bin/sh
2 2
3COPTS="--with-tests=regular"
4PARALLEL_JOBS=10 3PARALLEL_JOBS=10
5 4
6# Normal build test of all targets 5CI_BUILD_TYPE=$1
7./autogen.sh $COPTS $@ 6
8make -j $PARALLEL_JOBS 7DEFAULT_COPTS="--with-tests=regular"
9make -j $PARALLEL_JOBS examples 8WAYLAND_COPTS="--with-tests=regular --enable-wayland --enable-elput --enable-drm"
10make -j $PARALLEL_JOBS benchmark 9MISC_COPTS="--enable-harfbuzz --enable-liblz4 --enable-image-loader-webp --enable-xinput22 --enable-multisense --enable-lua-old --enable-xpresent --enable-hyphen"
10
11# --enable-libvlc --enable-vnc-server --enable-g-main-loop --enable-libuv --enable-fb --enable-eglfs --enable-sdl --enable-gl-drm --enable-egl --enable-pix man --enable-tile-rotate --enable-ecore-buffer --enable-image-loader-generic --enable-image-loader-jp2k --enable-gesture --enable-v4l2 --enable-xine
12# --with-profile=PROFILE --with-crypto=CRYPTO
13
14if [ "$CI_BUILD_TYPE" = "" ]; then
15 # Normal build test of all targets
16 ./autogen.sh $DEFAULT_COPTS
17 make -j $PARALLEL_JOBS
18 make -j $PARALLEL_JOBS examples
19 make -j $PARALLEL_JOBS benchmark
20fi
21
22if [ "$CI_BUILD_TYPE" = "wayland" ]; then
23 ./autogen.sh $WAYLAND_COPTS
24 make -j $PARALLEL_JOBS
25 make -j $PARALLEL_JOBS examples
26fi
27
28if [ "$CI_BUILD_TYPE" = "misc" ]; then
29 ./autogen.sh $MISC_COPTS
30 make -j $PARALLEL_JOBS
31 make -j $PARALLEL_JOBS examples
32fi
33
diff --git a/.travis.yml b/.travis.yml
index fff307fa3c..27140574e1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,8 @@ matrix:
12 include: 12 include:
13 - env: DISTRO=Ubuntu1710 13 - env: DISTRO=Ubuntu1710
14 - env: DISTRO=Fedora27 14 - env: DISTRO=Fedora27
15 - env: DISTRO=Fedora27 CI_BUILD_TYPE=wayland
16 - env: DISTRO=Fedora27 CI_BUILD_TYPE=misc
15 - env: DISTRO=Debian91 17 - env: DISTRO=Debian91
16 - env: DISTRO=Archlinux 18 - env: DISTRO=Archlinux
17 - os: osx 19 - os: osx
@@ -31,7 +33,7 @@ before_script:
31script: 33script:
32 - | 34 - |
33 if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$DISTRO" != "" ]]; then 35 if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$DISTRO" != "" ]]; then
34 docker run -v `pwd`:/src -w /src stefanschmidt1/ci-support-files:$DISTRO /src/.ci/ci-linux-build.sh 36 docker run -v `pwd`:/src -w /src stefanschmidt1/ci-support-files:$DISTRO /src/.ci/ci-linux-build.sh $CI_BUILD_TYPE
35 fi 37 fi
36 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then .ci/ci-osx-build.sh ; fi 38 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then .ci/ci-osx-build.sh ; fi
37 39