From b09944f4b85eb1278c2aaeb1638099b04ebfc106 Mon Sep 17 00:00:00 2001 From: Noel Eck Date: Wed, 14 Mar 2018 12:42:00 -0700 Subject: [PATCH] Cordova: Added cordova job to travis matrix The UPM Travis-CI will now attempt to build the Cordova bindings for UPM as a separate target. Signed-off-by: Noel Eck --- .travis.yml | 2 ++ docker-compose.yaml | 8 ++++++++ scripts/run-cmake.sh | 1 + 3 files changed, 11 insertions(+) diff --git a/.travis.yml b/.travis.yml index b23901e3..d985ce32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,6 +75,8 @@ jobs: - docker-compose run ${TARGET} - <<: *run-additional-jobs env: TARGET=android + - <<: *run-additional-jobs + env: TARGET=cordova - <<: *run-additional-jobs env: TARGET=examples - <<: *run-additional-jobs diff --git a/docker-compose.yaml b/docker-compose.yaml index 2537b6d2..2f5cce39 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -13,6 +13,7 @@ services: - BUILDFTI=${BUILDFTI:-ON} - BUILDSWIGPYTHON=${BUILDSWIGPYTHON:-OFF} - BUILDSWIGJAVA=${BUILDSWIGJAVA:-OFF} + - BUILDCORDOVA=${BUILDCORDOVA:-OFF} - BUILDSWIGNODE=${BUILDSWIGNODE:-OFF} - BUILDEXAMPLES=${BUILDEXAMPLES:-OFF} - IPK=${IPK:-OFF} @@ -113,6 +114,13 @@ services: - BUILDTESTS=OFF command: bash -c "./scripts/build-android.sh" + cordova: + extends: all + environment: + - BUILDSWIGJAVA=ON + - BUILDCORDOVA=ON + command: bash -c "./scripts/run-cmake.sh && cd build && make -j8 && make -j8" + node4: extends: base image: inteliotdevkit/upm-node4 diff --git a/scripts/run-cmake.sh b/scripts/run-cmake.sh index 85161205..8b0a693c 100755 --- a/scripts/run-cmake.sh +++ b/scripts/run-cmake.sh @@ -12,6 +12,7 @@ cmake \ -DBUILDSWIGPYTHON=$BUILDSWIGPYTHON \ -DBUILDSWIGNODE=$BUILDSWIGNODE \ -DBUILDSWIGJAVA=$BUILDSWIGJAVA \ + -DBUILDCORDOVA=$BUILDCORDOVA \ -DBUILDEXAMPLES=$BUILDEXAMPLES \ -DIPK=$IPK \ -DRPM=$RPM \