Merge pull request #152 from kirkshoop/travis

Kirk Shoop · Kirk Shoop · commit d58f68b187a1 · 2015-06-19T09:31:46.000-07:00
install better doxygen, deploy github releases
diff --git a/.travis.yml b/.travis.yml
@@ -3,158 +3,65 @@ language: cpp
 env:
   global:
     secure: FNZOWYO89qsT9kQKngrYbpnqCTMCSCSQ2rnZ3l17KHctOfS554TTDS+dfxPYz2XHm6azYDVcyBSs2gWJ6TmXZZZqEfr3X4VV4ooAa9PoeIkvVlT654zjZwxeXPYXrHFXZh/ImLUGWjsxRaUHYOv5SzyNGcZv07dtLKVd0ykhbH4=
-# Test matrix:
-# - Build matrix per compiler: C++11/C++14 + Debug/Release
-# - Optionally: AddressSanitizer (ASAN)
-# - Valgrind: all release builds are also tested with valgrind
-# - clang 3.4, 3.5, 3.6, trunk
-#   - Note: 3.4 and trunk are tested with/without ASAN,
-#     the rest is only tested with ASAN=On.
-# - gcc 4.9, 5.0
-#
 matrix:
   include:
-    # Test clang-3.4: C++11, Buidd=Debug/Release, ASAN=On/Off
-    # - env: CLANG_VERSION=3.4 BUILD_TYPE=Debug CPP=11 ASAN=On LIBCXX=On
-    #   os: linux
-    #   compiler: clang34
-    #   addons: &clang34
-    #     apt:
-    #       packages:
-    #         - valgrind
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - env: CLANG_VERSION=3.4 BUILD_TYPE=Release CPP=11 ASAN=On LIBCXX=On
-    #   os: linux
-    #   compiler: clang
-    #   addons: *clang34
-
-    # Test clang-3.7: C++11/C++14, Buidd=Debug/Release, ASAN=On/Off
-    # - env: CLANG_VERSION=3.7 BUILD_TYPE=Debug CPP=11 ASAN=On LIBCXX=On
-    #   os: linux
-    #   addons: &clang37
-    #     apt:
-    #       packages:
-    #         - clang-3.7
-    #         - valgrind
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-    #         - llvm-toolchain-precise
-
-    - env: BUILD_TYPE=Release CPP=11 ASAN=On LIBCXX=On RUN_TEST=On
-      os: osx
-      compiler: clang
-
-    - env: CLANG_VERSION=3.7 BUILD_TYPE=Release CPP=11 ASAN=On LIBCXX=On
-      os: linux
-      compiler: clang
-      addons: &clang37
-        apt:
-          packages:
-            - clang-3.7
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise
-
-    # - env: CLANG_VERSION=3.7 BUILD_TYPE=Debug CPP=14 ASAN=On LIBCXX=On
-    #   os: linux
-    #   addons: *clang37
-
-    # - env: CLANG_VERSION=3.7 BUILD_TYPE=Release CPP=14 ASAN=On LIBCXX=On
-    #   os: linux
-    #   addons: *clang37
-
-    # - env: CLANG_VERSION=3.7 BUILD_TYPE=Debug CPP=11 ASAN=Off LIBCXX=On
-    #   os: linux
-    #   addons: *clang37
-
-    # - env: CLANG_VERSION=3.7 BUILD_TYPE=Release CPP=11 ASAN=Off LIBCXX=On
-    #   os: linux
-    #   addons: *clang37
-
-    # - env: CLANG_VERSION=3.7 BUILD_TYPE=Debug CPP=14 ASAN=Off LIBCXX=On
-    #   os: linux
-    #   addons: *clang37
-
-    # - env: CLANG_VERSION=3.7 BUILD_TYPE=Release CPP=14 ASAN=Off LIBCXX=On
-    #   os: linux
-    #   addons: *clang37
-
-    # Test gcc-4.9: C++11, Build=Debug/Release, ASAN=Off
-    # - env: GCC_VERSION=4.9 BUILD_TYPE=Debug CPP=11 ASAN=Off LIBCXX=Off
-    #   os: linux
-    #   addons: &gcc49
-    #     apt:
-    #       packages:
-    #         - g++-4.9
-    #         - valgrind
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    - env: GCC_VERSION=4.9 BUILD_TYPE=Release CPP=11 ASAN=Off LIBCXX=Off RUN_TEST=On
-      os: linux
-      compiler: gcc
-      addons: &gcc49
-        apt:
-          packages:
-            - g++-4.9
-            - cmake
-          sources:
-            - ubuntu-toolchain-r-test
-            - kubuntu-backports
-
-    - env: GCC_VERSION=4.9 BUILD_TYPE=Release CPP=11 ASAN=Off LIBCXX=Off PROJECT=doc PUBLISH_DOCS=On
-      os: linux
-      compiler: gcc
-      addons: &gcc49docs
-        apt:
-          packages:
-            - g++-4.9
-            - cmake
-            - doxygen
-            - graphviz
-          sources:
-            - ubuntu-toolchain-r-test
-            - kubuntu-backports
-
-    # Test gcc-5.0: C++11/14, Build=Debug/Release, ASAN=Off
-    # - env: GCC_VERSION=5 BUILD_TYPE=Debug CPP=11 ASAN=Off LIBCXX=Off
-    #   os: linux
-    #   addons: &gcc5
-    #     apt:
-    #       packages:
-    #         - gcc-5
-    #         - valgrind
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - env: GCC_VERSION=5 BUILD_TYPE=Release CPP=11 ASAN=Off LIBCXX=Off
-    #   os: linux
-    #   addons: *gcc5
-
-    # - env: GCC_VERSION=5 BUILD_TYPE=Debug CPP=14 ASAN=Off LIBCXX=Off
-    #   os: linux
-    #   addons: *gcc5
-
-    # - env: GCC_VERSION=5 BUILD_TYPE=Release CPP=14 ASAN=Off LIBCXX=Off
-    #   os: linux
-    #   addons: *gcc5
+  - env: BUILD_TYPE=Release CPP=11 ASAN=On LIBCXX=On RUN_TEST=On
+    os: osx
+    compiler: clang
+  - env: CLANG_VERSION=3.7 BUILD_TYPE=Release CPP=11 ASAN=On LIBCXX=On
+    os: linux
+    compiler: clang
+    addons:
+      apt:
+        packages:
+        - clang-3.7
+        sources:
+        - ubuntu-toolchain-r-test
+        - llvm-toolchain-precise
+  - env: GCC_VERSION=4.9 BUILD_TYPE=Release CPP=11 ASAN=Off LIBCXX=Off RUN_TEST=On
+    os: linux
+    compiler: gcc
+    addons:
+      apt:
+        packages:
+        - 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
+    os: linux
+    compiler: gcc
+    addons:
+      apt:
+        packages:
+        - g++-4.9
+        - graphviz
+        sources:
+        - ubuntu-toolchain-r-test
 before_install:
-- if [ -n "$GCC_VERSION" ]; then export CXX="g++-${GCC_VERSION}" CC="gcc-${GCC_VERSION}"; fi
-- if [ -n "$CLANG_VERSION" ]; then export CXX="clang++-${CLANG_VERSION}" CC="clang-${CLANG_VERSION}"; fi
+- if [ -n "$GCC_VERSION" ]; then export CXX="g++-${GCC_VERSION}" CC="gcc-${GCC_VERSION}";
+  fi
+- if [ -n "$CLANG_VERSION" ]; then export CXX="clang++-${CLANG_VERSION}" CC="clang-${CLANG_VERSION}";
+  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
 - if [ -n "$CLANG_VERSION" ]; then sh projects/scripts/install_libcxx.sh; fi
 install:
 - export CXX_FLAGS=""
 - export CXX_LINKER_FLAGS=""
 - if [ -z "$BUILD_TYPE" ]; then export BUILD_TYPE=Release; fi
-- if [ "$ASAN" == "On"]; then export CXX_FLAGS="${CXX_FLAGS} -fsanitize=address,undefined,integer -fno-omit-frame-pointer -fno-sanitize=unsigned-integer-overflow"; fi
-- if [ -n "$CLANG_VERSION" ]; then CXX_FLAGS="${CXX_FLAGS} -D__extern_always_inline=inline"; fi
-- if [ "$LIBCXX" == "On" ]; then CXX_FLAGS="${CXX_FLAGS} -stdlib=libc++ -I/usr/include/c++/v1/"; fi
-- if [ "$LIBCXX" == "On" ]; then CXX_LINKER_FLAGS="${CXX_FLAGS} -L/usr/lib/ -lc++"; fi
+- if [ "$ASAN" == "On"]; then export CXX_FLAGS="${CXX_FLAGS} -fsanitize=address,undefined,integer
+  -fno-omit-frame-pointer -fno-sanitize=unsigned-integer-overflow"; fi
+- if [ -n "$CLANG_VERSION" ]; then CXX_FLAGS="${CXX_FLAGS} -D__extern_always_inline=inline";
+  fi
+- if [ "$LIBCXX" == "On" ]; then CXX_FLAGS="${CXX_FLAGS} -stdlib=libc++ -I/usr/include/c++/v1/";
+  fi
+- if [ "$LIBCXX" == "On" ]; then CXX_LINKER_FLAGS="${CXX_FLAGS} -L/usr/lib/ -lc++";
+  fi
 - cmake . -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_EXE_LINKER_FLAGS="${CXX_LINKER_FLAGS}"
 script:
 - make VERBOSE=1 $PROJECT
@@ -171,3 +78,12 @@ notifications:
     on_success: always
     on_failure: always
   slack: reactivex:eq4FFCchRIzufO2ZmpuuiJ9E
+deploy:
+  provider: releases
+  api_key:
+    secure: sMyo0U4WxZ0kOlQ9SzKfeuU2/5y0Ngt8A0B0N6bb0TcGIyLhQv2q216Q+T0rkQKc04WnLY0Vr1/q9LonAA46nGq7zAiWcC3TY0zVUKRmKWrotQb/QqW1tvVEARKwG7CO+HCcGT3XCeM69XA/L7WiXRskTxS1+5Vy46/tVZBKofg=
+  file: ''
+  on:
+    condition: $PUBLISH_DOCS = On
+    tags: true
+    repo: Reactive-Extensions/RxCpp
diff --git a/projects/scripts/travis-install.sh b/projects/scripts/travis-install.sh
@@ -6,7 +6,6 @@ echo "TRAVIS_OS_NAME=$TRAVIS_OS_NAME"
 
 #if OS is linux or is not set
 if [ "$TRAVIS_OS_NAME" = linux -o -z "$TRAVIS_OS_NAME" ]; then
-    echo "installing for linux..."
 
     wget http://www.cmake.org/files/v3.2/cmake-3.2.3-Linux-x86_64.sh
     chmod a+x cmake-3.2.3-Linux-x86_64.sh
@@ -16,7 +15,6 @@ if [ "$TRAVIS_OS_NAME" = linux -o -z "$TRAVIS_OS_NAME" ]; then
     cmake --version
 
 elif [ "$TRAVIS_OS_NAME" = osx ]; then
-    echo "installing for osx..."
 
     xcode-select --install
     brew update || echo "suppress failures in order to ignore warnings"
