celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject celix git commit: CELIX-387: Updates travis cfg. Splits up the matrix so that the env are configured more specifically
Date Fri, 13 Jan 2017 15:38:31 GMT
Repository: celix
Updated Branches:
  refs/heads/develop f0fb4fee9 -> 14c863583


CELIX-387: Updates travis cfg. Splits up the matrix so that the env are configured more specifically


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

Branch: refs/heads/develop
Commit: 14c86358339177b0502c934b418345c7e0ae6c3b
Parents: f0fb4fe
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Fri Jan 13 16:36:55 2017 +0100
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Fri Jan 13 16:36:55 2017 +0100

----------------------------------------------------------------------
 .travis.yml | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/14c86358/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 0179761..e3a4396 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,22 +1,8 @@
 
 sudo: required
-dist: trusty
-#osx_image: xcode8.2
 
 language: c
 
-os:
-    - linux
-      #    - osx
-
-compiler:
-    - gcc
-    - clang
-
-services:
-    - docker
-
-
 env:
     global:
         - COVERITY_SCAN_BUILD_COMMAND="make"
@@ -32,17 +18,32 @@ env:
 matrix:
     include:
        - os: linux
+         dist: trusty
+         compiler: gcc
+       - os: linux
+         dist: trusty
+         compiler: clang
+       - os: osx
+         osx_image: xcode7.3
+         compiler: gcc
+         env: MACOSX_DEPLOYMENT_TARGET=10.11
+       - os: osx
+         osx_image: xcode7.3
+         compiler: clang
+         env: MACOSX_DEPLOYMENT_TARGET=10.11
+       - os: linux
+         dist: trusty
          compiler: gcc
          env: SANITIZE=1
        - os: linux
+         dist: trusty
          compiler: clang
          env: ANDROID=1
-
+         services: docker
 
 before_install:
   - if [ "$TRAVIS_OS_NAME" = "linux" ] &&  [ -z "$ANDROID" ]; then sudo add-apt-repository
ppa:ubuntu-toolchain-r/test -y && sudo apt-get -qq update && sudo apt-get
install -y uuid-dev libxml2-dev lcov libffi-dev gcc-4.8 g++-4.8; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew uninstall cmake; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install lcov libffi
cmake && brew link --force libffi; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install lcov libffi
&& brew link --force libffi; fi
 
 before_script:
     - wget https://github.com/cpputest/cpputest/releases/download/v3.8/cpputest-3.8.tar.gz
-O /tmp/cpputest.tar.gz
@@ -89,7 +90,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;
else cd .. && docker build -t celixandroid - < Dockerfile.Android ; fi
+    - if [ -z "$ANDROID" ]; then make all && make deploy && sudo make install;
else cd .. && 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