Merge pull request #181 from Reactive-Extensions/traviscifix

update travisci

1 files changed, 61 insertions, 20 deletions

diff --git a/.travis.yml b/.travis.yml
index 4586845..5a53741 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,7 @@ matrix:
         - clang-3.7
         sources:
         - ubuntu-toolchain-r-test
+        - llvm-toolchain-precise-3.7
         - llvm-toolchain-precise
   - env: GCC_VERSION=4.9 BUILD_TYPE=Release CPP=11 ASAN=Off LIBCXX=Off RUN_TEST=On
     os: linux
@@ -27,17 +28,18 @@ matrix:
         - g++-4.9
         sources:
         - ubuntu-toolchain-r-test
-  - env: GCC_VERSION=4.9 BUILD_TYPE=Release CPP=11 ASAN=Off LIBCXX=Off PROJECT=doc
-      PUBLISH_DOCS=On
+  - env: CLANG_VERSION=3.7 BUILD_TYPE=Release CPP=11 ASAN=Off LIBCXX=On PROJECT=doc PUBLISH_DOCS=On
     os: linux
-    compiler: gcc
+    compiler: clang
     addons:
       apt:
         packages:
-        - g++-4.9
+        - clang-3.7
         - graphviz
         sources:
         - ubuntu-toolchain-r-test
+        - llvm-toolchain-precise-3.7
+        - llvm-toolchain-precise
 before_install:
   - if [ -n "$GCC_VERSION" ]; then export CXX="g++-${GCC_VERSION}" CC="gcc-${GCC_VERSION}";
     fi
@@ -45,12 +47,39 @@ before_install:
     fi
   - which $CXX
   - which $CC
-  - if [ "$PUBLISH_DOCS" == "On" ]; then sudo apt-add-repository -y ppa:libreoffice/libreoffice-4-2; fi
-  - if [ "$PUBLISH_DOCS" == "On" ]; then sudo apt-get update || echo "ignore update failure"; fi
-  - if [ "$PUBLISH_DOCS" == "On" ]; then sudo apt-get install doxygen; fi
-  - sh projects/scripts/travis-install.sh
+  ############################################################################
+  # Install publish tools (doxygen, biicode)
+  ############################################################################
+  - |
+    if [[ "$PUBLISH_DOCS" == "On" ]]; then
+      sudo apt-add-repository -y ppa:libreoffice/libreoffice-4-2
+      sudo apt-get update || echo "ignore update failure"
+      sudo apt-get install doxygen
+      wget http://apt.biicode.com/install.sh && chmod +x install.sh && ./install.sh
+    fi
+  ############################################################################
+  # Install a recent CMake
+  ############################################################################
+  - |
+    if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
+      CMAKE_URL="http://www.cmake.org/files/v3.3/cmake-3.3.2-Linux-x86_64.tar.gz"
+      mkdir ${TRAVIS_BUILD_DIR}/cmake && travis_retry wget --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C ${TRAVIS_BUILD_DIR}/cmake
+      export PATH=${TRAVIS_BUILD_DIR}/cmake/bin:${PATH}
+    else
+      xcode-select --install
+      brew update || echo "suppress failures in order to ignore warnings"
+      brew doctor || echo "suppress failures in order to ignore warnings"
+      brew list cmake || echo "suppress failures in order to ignore warnings"
+      sudo brew uninstall --force cmake || "suppress failures in order to ignore warnings"
+      brew search cmake || echo "suppress failures in order to ignore warnings"
+      brew install cmake || echo "suppress failures in order to ignore warnings"
+      brew upgrade cmake || echo "suppress failures in order to ignore warnings"
+    fi
+  - cmake --version
+  ############################################################################
+  # Install LIBCXX
+  ############################################################################
   - if [ -n "$CLANG_VERSION" ]; then sh projects/scripts/install_libcxx.sh; fi
-  - if [ "$PUBLISH_DOCS" == "On" ]; then wget http://apt.biicode.com/install.sh && chmod +x install.sh && ./install.sh; fi
 install:
   - export CXX_FLAGS=""
   - export CXX_LINKER_FLAGS=""
@@ -66,27 +95,39 @@ install:
   - cmake . -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_EXE_LINKER_FLAGS="${CXX_LINKER_FLAGS}"
 script:
   - make VERBOSE=1 $PROJECT
-  - if [ "$RUN_TEST" == "On" ]; then cd build/test/; fi
-  - if [ "$RUN_TEST" == "On" ]; then ctest -V; fi
-  - if [ "$RUN_TEST" == "On" ]; then cd ../../; fi
+  - |
+    if [[ "$RUN_TEST" == "On" ]]; then
+      cd build/test/
+      ctest -V
+      cd ../../
+    fi
 after_success:
-  - if [ "$PUBLISH_DOCS" == "On" ]; then sh projects/scripts/travis-doxygen.sh; fi
-  - if [ "$PUBLISH_DOCS" == "On" ]; then cd projects/biicode; fi
-  - if [ "$PUBLISH_DOCS" == "On" ]; then cp ../../AUTHORS.txt ./blocks/kirkshoop/rxcpp/AUTHORS.txt; fi
-  - if [ "$PUBLISH_DOCS" == "On" ]; then cp ../../Rx/v2/src/license.txt ./blocks/kirkshoop/rxcpp/license.txt; fi
-  - if [ "$PUBLISH_DOCS" == "On" ]; then cp -r ../../Rx/v2/src/rxcpp/* ./blocks/kirkshoop/rxcpp/*; fi
-  - if [ "$PUBLISH_DOCS" == "On" ]; then bii setup:cpp; fi
-  - if [ "$PUBLISH_DOCS" == "On" ]; then bii init; fi
+  - |
+    if [[ "$PUBLISH_DOCS" == "On" ]]; then
+      sh projects/scripts/travis-doxygen.sh
+      cd projects/biicode
+      cp ../../AUTHORS.txt ./blocks/kirkshoop/rxcpp/AUTHORS.txt
+      cp ../../Rx/v2/src/license.txt ./blocks/kirkshoop/rxcpp/license.txt
+      cp -r ../../Rx/v2/src/rxcpp/* ./blocks/kirkshoop/rxcpp/*
+      bii setup:cpp
+      bii init
+    fi
 branches:
   only:
   - master
 notifications:
   email:
     recipients:
-    - kirk.shoop@microsoft.com
+      - kirk.shoop@microsoft.com
     on_success: always
     on_failure: always
   slack: reactivex:eq4FFCchRIzufO2ZmpuuiJ9E
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/fcf05f21f5d4102e12e7
+    on_success: change  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+    on_start: never     # options: [always|never|change] default: always
 deploy:
   - provider: releases
     api_key: