From 7a3d9b32ed25f5a0a468dab1b8ee87e28a81bafb Mon Sep 17 00:00:00 2001 From: Matthias Volk Date: Tue, 9 May 2017 18:37:47 +0200 Subject: [PATCH] Folding in travis --- travis/install_osx.sh | 12 ++++++++++++ travis/postsubmit-helper.sh | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/travis/install_osx.sh b/travis/install_osx.sh index 27f192d24..2125d65cc 100755 --- a/travis/install_osx.sh +++ b/travis/install_osx.sh @@ -2,6 +2,12 @@ # Script installing dependencies # Inspired by https://github.com/google/fruit +travis_fold() { + local action=$1 + local name=$2 + echo -en "travis_fold:${action}:${name}\r" +} + set -e # Helper for installing packages via homebrew @@ -17,8 +23,11 @@ install_brew_package() { } # Update packages +travis_fold start brew_update brew update +travis_fold end brew_update +travis_fold start brew_install_util # For md5sum install_brew_package md5sha1sum # For `timeout' @@ -39,9 +48,11 @@ clang-3.9) install_brew_package llvm@3.9 --with-clang --with-libcxx;; clang-4.0) install_brew_package llvm --with-clang --with-libcxx;; *) echo "Compiler not supported: ${COMPILER}. See travis_ci_install_osx.sh"; exit 1 ;; esac +travis_fold end brew_install_util # Install dependencies +travis_fold start brew_install_dependencies install_brew_package gmp --c++11 install_brew_package cln install_brew_package ginac @@ -50,3 +61,4 @@ install_brew_package boost --c++11 brew tap homebrew/science install_brew_package homebrew/science/glpk install_brew_package homebrew/science/hwloc +travis_fold end brew_install_dependencies diff --git a/travis/postsubmit-helper.sh b/travis/postsubmit-helper.sh index c521b23c9..0514dfb31 100755 --- a/travis/postsubmit-helper.sh +++ b/travis/postsubmit-helper.sh @@ -77,9 +77,17 @@ clang-default) exit 1 esac +travis_fold() { + local action=$1 + local name=$2 + echo -en "travis_fold:${action}:${name}\r" +} + run_make() { + travis_fold start make # VERBOSE=1 make storm -j$N_JOBS make resources -j$N_JOBS + travis_fold end make } # Build @@ -94,8 +102,11 @@ ReleasePlain) CMAKE_ARGS=(-DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS=" esac # Restore timestamps of files +travis_fold start mtime ruby travis/mtime_cache/mtime_cache.rb -g travis/mtime_cache/globs.txt -c travis/mtime_cache/cache.json +travis_fold end mtime +travis_fold start cmake #rm -rf build mkdir -p build cd build @@ -107,4 +118,5 @@ then cat CMakeFiles/CMakeError.log fi echo +travis_fold end cmake run_make