From 908a9e9fa1aa818b634b5196758192dfd369ec6c Mon Sep 17 00:00:00 2001 From: "Daniel J. Hofmann" Date: Mon, 15 Feb 2016 18:56:38 -0800 Subject: [PATCH] Reorders Travis builds by most likely failing one --- .travis.yml | 86 +++++++++++++++++++++++++++++------------------------ 1 file changed, 47 insertions(+), 39 deletions(-) diff --git a/.travis.yml b/.travis.yml index f8db11431..e7509b1aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,44 +15,37 @@ matrix: include: - # 1/ Linux Clang Builds + # Debug Builds - os: linux - compiler: clang - addons: &clang38 + compiler: gcc + addons: &gcc5 apt: - sources: ['llvm-toolchain-precise', 'ubuntu-toolchain-r-test'] - packages: ['clang-3.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'rubygems-integration', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev'] - env: COMPILER='clang++-3.8' BUILD_TYPE='Release' + sources: ['ubuntu-toolchain-r-test'] + packages: ['g++-5', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'rubygems-integration', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev'] + env: COMPILER='g++-5' BUILD_TYPE='Debug' - - os: linux - compiler: clang - addons: &clang38 - apt: - sources: ['llvm-toolchain-precise', 'ubuntu-toolchain-r-test'] - packages: ['clang-3.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'rubygems-integration', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev'] - env: COMPILER='clang++-3.8' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON - - - os: linux - compiler: clang - addons: *clang38 - env: COMPILER='clang++-3.8' BUILD_TYPE='Debug' - - - # 2/ Linux GCC Builds - os: linux compiler: gcc addons: &gcc48 apt: sources: ['ubuntu-toolchain-r-test'] packages: ['g++-4.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'rubygems-integration', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev'] - env: COMPILER='g++-4.8' BUILD_TYPE='Release' - - - os: linux - compiler: gcc - addons: *gcc48 env: COMPILER='g++-4.8' BUILD_TYPE='Debug' + - os: linux + compiler: clang + addons: &clang38 + apt: + sources: ['llvm-toolchain-precise', 'ubuntu-toolchain-r-test'] + packages: ['clang-3.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'rubygems-integration', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev'] + env: COMPILER='clang++-3.8' BUILD_TYPE='Debug' + - os: osx + osx_image: xcode7 + compiler: clang + env: COMPILER='clang++' BUILD_TYPE='Debug' + + # Release Builds - os: linux compiler: gcc addons: &gcc5 @@ -61,6 +54,28 @@ matrix: packages: ['g++-5', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'rubygems-integration', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev'] env: COMPILER='g++-5' BUILD_TYPE='Release' + - os: linux + compiler: gcc + addons: &gcc48 + apt: + sources: ['ubuntu-toolchain-r-test'] + packages: ['g++-4.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'rubygems-integration', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev'] + env: COMPILER='g++-4.8' BUILD_TYPE='Release' + + - os: linux + compiler: clang + addons: &clang38 + apt: + sources: ['llvm-toolchain-precise', 'ubuntu-toolchain-r-test'] + packages: ['clang-3.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'rubygems-integration', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev'] + env: COMPILER='clang++-3.8' BUILD_TYPE='Release' + + - os: osx + osx_image: xcode7 + compiler: clang + env: COMPILER='clang++' BUILD_TYPE='Release' + + # Shared Library - os: linux compiler: gcc addons: &gcc5 @@ -70,9 +85,12 @@ matrix: env: COMPILER='g++-5' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON - os: linux - compiler: gcc - addons: *gcc5 - env: COMPILER='g++-5' BUILD_TYPE='Debug' + compiler: clang + addons: &clang38 + apt: + sources: ['llvm-toolchain-precise', 'ubuntu-toolchain-r-test'] + packages: ['clang-3.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'rubygems-integration', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev'] + env: COMPILER='clang++-3.8' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON # Disabled until tests all pass on OSX: @@ -93,16 +111,6 @@ matrix: # compiler: clang # env: COMPILER='clang++' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON - - os: osx - osx_image: xcode7 - compiler: clang - env: COMPILER='clang++' BUILD_TYPE='Debug' - - - os: osx - osx_image: xcode7 - compiler: clang - env: COMPILER='clang++' BUILD_TYPE='Release' - #- os: osx # osx_image: xcode7 # compiler: clang