You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by bp...@apache.org on 2015/11/06 16:38:05 UTC
celix git commit: CELIX-282: Fixed travis setup
Repository: celix
Updated Branches:
refs/heads/develop 79f8239dc -> e57818bb7
CELIX-282: Fixed travis setup
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/e57818bb
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/e57818bb
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/e57818bb
Branch: refs/heads/develop
Commit: e57818bb7843b3d30c9e310935bfd4fcfc8260f7
Parents: 79f8239
Author: Bjoern Petri <bp...@apache.org>
Authored: Fri Nov 6 16:37:46 2015 +0100
Committer: Bjoern Petri <bp...@apache.org>
Committed: Fri Nov 6 16:37:46 2015 +0100
----------------------------------------------------------------------
.travis.yml | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/e57818bb/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 8a3d97f..7318c11 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,16 +9,22 @@ compiler:
- clang
before_install:
- - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update && sudo apt-get install -y uuid-dev libjansson-dev libxml2-dev lcov libffi-dev; fi
- - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install lcov libffi jansson && brew link --force libffi; fi
+ - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update && sudo apt-get install -y uuid-dev libxml2-dev lcov libffi-dev; 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.github.io/blob/master/releases/cpputest-3.7.1.tar.gz?raw=true -O /tmp/cpputest.tar.gz
- tar -xzvf /tmp/cpputest.tar.gz -C /tmp
- if [ "$CC" = "clang" ]; then export CXX="clang++"; fi && cd /tmp/cpputest-3.7.1 && ./configure --prefix=/usr && make && sudo make install && cd -
- cd /tmp/cpputest-3.7.1 && ./configure --prefix=/usr && make && sudo make install && cd -
+ - git clone https://github.com/akheron/jansson.git jansson-build
+ - cd jansson-build && git checkout 2.7
+ - cmake -DJANSSON_BUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr . && make
+ - sudo make install
+ - cd -
- mkdir build install
+
script:
# the following setup is broken:
# RSA_DISCOVERY_SHM is only working on linux, but both compilers (see CELIX-277)