From c24a8f8b2097c56376890504c128c635d9dee765 Mon Sep 17 00:00:00 2001 From: Nicolas Oliver Date: Thu, 12 Oct 2017 13:12:03 -0700 Subject: [PATCH] travis: build examples in additional jobs Signed-off-by: Nicolas Oliver --- .travis.yml | 2 ++ docker-compose.yaml | 20 +++++++++++++++++++- scripts/run-cmake.sh | 4 +++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7d9b669..b06511c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,6 +83,8 @@ jobs: - docker-compose run ${TARGET} - <<: *run-additional-jobs env: TARGET=android + - <<: *run-additional-jobs + env: TARGET=examples - <<: *run-additional-jobs env: TARGET=usbplat - <<: *run-additional-jobs diff --git a/docker-compose.yaml b/docker-compose.yaml index b8f7446..9b6d27e 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -23,7 +23,7 @@ services: - FTDI4222=${FTDI4222:-OFF} - IPK=${IPK:-OFF} - RPM=${RPM:-OFF} - - ENABLEEXAMPLES=${ENABLEEXAMPLES:-ON} + - ENABLEEXAMPLES=${ENABLEEXAMPLES:-OFF} - INSTALLGPIOTOOL=${INSTALLGPIOTOOL:-OFF} - INSTALLTOOLS=${INSTALLTOOLS:-ON} - CC=${CC:-clang-3.8} @@ -46,6 +46,21 @@ services: - BUILDDOC=ON command: bash -c "./scripts/run-cmake.sh && ./scripts/build-doc.sh" + examples: + extends: all + environment: + - BUILDSWIG=ON + - BUILDSWIGPYTHON=ON + - BUILDSWIGNODE=ON + - BUILDSWIGJAVA=ON + - ENABLEEXAMPLES=ON + - USBPLAT=ON + - FIRMATA=ON + - ONEWIRE=ON + - IMRAA=ON + - FTDI4222=ON + command: bash -c "./scripts/run-cmake.sh && make -Cbuild" + sonar-scan: extends: all environment: @@ -53,6 +68,7 @@ services: - BUILDSWIGPYTHON=ON - BUILDSWIGNODE=ON - BUILDSWIGJAVA=ON + - ENABLEEXAMPLES=ON - ONEWIRE=ON - JSONPLAT=ON - SONAR_TOKEN @@ -94,12 +110,14 @@ services: extends: all environment: - IPK=ON + - ENABLEEXAMPLES=ON command: bash -c "./scripts/run-cmake.sh && make -Cbuild package" rpm: extends: all environment: - RPM=ON + - ENABLEEXAMPLES=ON command: bash -c "./scripts/run-cmake.sh && make -Cbuild package" python2: diff --git a/scripts/run-cmake.sh b/scripts/run-cmake.sh index f8d4ec5..14c9149 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 \ -DBUILDARCH=$BUILDARCH \ @@ -24,4 +27,3 @@ cmake \ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ -H. \ -Bbuild -