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: Fixes travis cfg
Date Mon, 21 Nov 2016 19:49:52 GMT
Repository: celix
Updated Branches:
  refs/heads/develop 2f81c78c2 -> f0d485337


CELIX-387: Fixes travis cfg


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

Branch: refs/heads/develop
Commit: f0d48533724b2852f3ac214962d58df9fc08c35c
Parents: 2f81c78
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Mon Nov 21 20:54:13 2016 +0100
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Mon Nov 21 20:54:13 2016 +0100

----------------------------------------------------------------------
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/f0d48533/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index b543400..66564e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,8 +45,8 @@ before_install:
 before_script:
     - wget https://github.com/cpputest/cpputest/releases/download/v3.8/cpputest-3.8.tar.gz
-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/local && make && sudo make install &&
cd -
-    - cd /tmp/cpputest-3.7.1 && ./configure --prefix=/usr/local && make &&
sudo make install && cd -
+    - if [ "$CC" = "clang" ]; then export CXX="clang++"; fi && cd /tmp/cpputest-*
&& ./configure --prefix=/usr/local && make && sudo make install &&
cd -
+    - cd /tmp/cpputest-* && ./configure --prefix=/usr/local && 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/local . &&
make


Mime
View raw message