From 35e4fc012e25923017e302e27d8e43473b5698be Mon Sep 17 00:00:00 2001 From: Nicolas Oliver Date: Thu, 12 Oct 2017 15:50:05 -0700 Subject: [PATCH] travis: build examples in additional jobs Signed-off-by: Nicolas Oliver --- .travis.yml | 2 ++ docker-compose.yaml | 13 +++++++++++-- scripts/run-cmake.sh | 3 +++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f1e8b717..b3a70852 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,6 +71,8 @@ jobs: - docker-compose run ${TARGET} - <<: *run-additional-jobs env: TARGET=android + - <<: *run-additional-jobs + env: TARGET=examples - <<: *run-additional-jobs env: TARGET=sonar-scan - <<: *run-additional-jobs diff --git a/docker-compose.yaml b/docker-compose.yaml index 3726f6e8..0db96cc2 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -14,7 +14,7 @@ services: - BUILDSWIGPYTHON=${BUILDSWIGPYTHON:-OFF} - BUILDSWIGJAVA=${BUILDSWIGJAVA:-OFF} - BUILDSWIGNODE=${BUILDSWIGNODE:-OFF} - - BUILDEXAMPLES=${BUILDEXAMPLES:-ON} + - BUILDEXAMPLES=${BUILDEXAMPLES:-OFF} - IPK=${IPK:-OFF} - RPM=${RPM:-OFF} - NPM=${NPM:-OFF} @@ -39,6 +39,15 @@ services: - BUILDDOC=ON command: bash -c "./scripts/run-cmake.sh && ./scripts/build-doc.sh" + examples: + extends: all + environment: + - BUILDSWIGPYTHON=ON + - BUILDSWIGJAVA=ON + - BUILDSWIGNODE=ON + - BUILDEXAMPLES=ON + command: bash -c "./scripts/run-cmake.sh && cd build && make -j8" + ipk: extends: all environment: @@ -66,7 +75,7 @@ services: - BUILDSWIGPYTHON=ON - BUILDSWIGNODE=ON - BUILDSWIGJAVA=ON - - BUILDSWIGEXAMPLES=ON + - BUILDEXAMPLES=ON - SONAR_TOKEN - SONAR_ORG - SONAR_PROJ_KEY diff --git a/scripts/run-cmake.sh b/scripts/run-cmake.sh index 66c65bf1..85161205 100755 --- a/scripts/run-cmake.sh +++ b/scripts/run-cmake.sh @@ -1,5 +1,8 @@ #!/usr/bin/env bash +set -x +set -e + # Run cmake cmake \ -DSWIG_EXECUTABLE=/usr/bin/swig \