Browse Source

fix travis build on osx

Julius Pfrommer 6 years ago
parent
commit
31c694a688
2 changed files with 4 additions and 4 deletions
  1. 2 1
      tools/travis/travis_osx_before_install.sh
  2. 2 3
      tools/travis/travis_osx_script.sh

+ 2 - 1
tools/travis/travis_osx_before_install.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 set -ev
 
+brew update
 brew install check
 brew install userspace-rcu
 brew install valgrind
@@ -8,4 +9,4 @@ brew install graphviz
 
 pip install --user sphinx
 pip install --user breathe
-pip install --user sphinx_rtd_theme
+pip install --user sphinx_rtd_theme

+ 2 - 3
tools/travis/travis_osx_script.sh

@@ -5,8 +5,7 @@ echo "\n=== Building ==="
 export OPENSSL_ROOT_DIR="/usr/local/opt/openssl"
 export PATH="/Users/travis/Library/Python/2.7/bin:$PATH"
 
-
-echo "Documentation and certificate build"  && echo -en 'travis_fold:start:script.build.doc\\r'
+echo "Documentation and certificate build" && echo -en 'travis_fold:start:script.build.doc\\r'
 mkdir -p build && cd build
 cmake -DCMAKE_BUILD_TYPE=Release -DUA_BUILD_EXAMPLES=ON -DUA_BUILD_SELFSIGNED_CERTIFICATE=ON ..
 make selfsigned
@@ -15,7 +14,7 @@ cp examples/server_cert.der ../
 cd .. && rm -rf build
 echo -en 'travis_fold:end:script.build.doc\\r'
 
-echo "Full Namespace 0 Generation"  && echo -en 'travis_fold:start:script.build.ns0\\r'
+echo "Full Namespace 0 Generation" && echo -en 'travis_fold:start:script.build.ns0\\r'
 mkdir -p build
 cd build
 cmake -DCMAKE_BUILD_TYPE=Debug -DUA_ENABLE_FULL_NS0=ON -DUA_BUILD_EXAMPLES=ON  ..