celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bpe...@apache.org
Subject celix git commit: CELIX-247: travis adapt Dockerbuild
Date Sun, 24 Jan 2016 11:16:43 GMT
Repository: celix
Updated Branches:
  refs/heads/develop 8302c5f10 -> 264be1890


CELIX-247: travis adapt Dockerbuild


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/264be189
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/264be189
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/264be189

Branch: refs/heads/develop
Commit: 264be1890c5d06a71b6d7150360563b456b54028
Parents: 8302c5f
Author: Bjoern Petri <bpetri@apache.org>
Authored: Sun Jan 24 12:16:00 2016 +0100
Committer: Bjoern Petri <bpetri@apache.org>
Committed: Sun Jan 24 12:16:00 2016 +0100

----------------------------------------------------------------------
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/264be189/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 33c2c8e..5ed0841 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -83,7 +83,7 @@ script:
     - if [ "$CC" = "gcc" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then export BUILD_OPTS="${BUILD_OPTS}
-DENABLE_CODE_COVERAGE=ON"; fi
     - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -z "$ANDROID" ]; then cmake ${BUILD_OPTIONS}
${BUILD_OPTIONS_LINUX} -DBUILD_FRAMEWORK_TESTS=ON -DBUILD_UTILS-TESTS=ON -DENABLE_TESTING=ON
${BUILD_OPTS} -DCMAKE_INSTALL_PREFIX=../install ..; fi
     - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake ${BUILD_OPTIONS} ${BUILD_OPTIONS_OSX}
-DBUILD_FRAMEWORK_TESTS=ON -DBUILD_UTILS-TESTS=ON -DENABLE_TESTING=ON -DFFI_LIBRARY=/usr/local/opt/libffi/lib/libffi.dylib
${BUILD_OPTS} -DCMAKE_INSTALL_PREFIX=../install ..; fi
-    - if [ -z "$ANDROID" ]; then make all && make deploy && make install-all;
else docker build -t celixandroid ..; fi
+    - if [ -z "$ANDROID" ]; then make all && make deploy && make install-all;
else docker build -t celixandroid - < ../Dockerfile.Android ; fi
     - if [ -z "$ANDROID" ]; then export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:`pwd`/utils:`pwd`/framework:`pwd`/dfi
&& make test ARGS="-V"; else docker run celixandroid; fi 
 
 after_success:


Mime
View raw message