diff --git a/.travis.yml b/.travis.yml index 637416b..c5c081d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,40 +29,30 @@ jobs: - os: linux compiler: gcc env: TASK=Test CONFIG=Release DOCKER=storm:travis PYTHON=python3 - install: - travis/install_linux.sh script: travis/build.sh # Docker Storm master in debug mode - os: linux compiler: gcc env: TASK=Test CONFIG=Debug DOCKER=storm:travis-debug PYTHON=python3 - install: - travis/install_linux.sh script: travis/build.sh # Docker Storm stable - os: linux compiler: gcc env: TASK=Test CONFIG=Release DOCKER=storm:1.2.1 PYTHON=python3 - install: - travis/install_linux.sh script: travis/build.sh # Docker Storm stable in debug mode - os: linux compiler: gcc env: TASK=Test CONFIG=Debug DOCKER=storm:1.2.1-debug PYTHON=python3 - install: - travis/install_linux.sh script: travis/build.sh # Documentation - os: linux compiler: gcc env: TASK=Documentation CONFIG=Release DOCKER=storm:travis PYTHON=python3 - install: - travis/install_linux.sh script: travis/build.sh before_deploy: diff --git a/travis/install_linux.sh b/travis/install_linux.sh deleted file mode 100755 index 911b673..0000000 --- a/travis/install_linux.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -e - -sudo apt-get install -qq -y docker diff --git a/travis/install_osx.sh b/travis/install_osx.sh deleted file mode 100755 index b7cec33..0000000 --- a/travis/install_osx.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/bash -# Script installing dependencies -# Inspired by https://github.com/google/fruit - -set -e - -# Helper for travis folding -travis_fold() { - local action=$1 - local name=$2 - echo -en "travis_fold:${action}:${name}\r" -} - -# Helper for installing packages via homebrew -install_brew_package() { - if brew list -1 | grep -q "^$1\$"; then - # Package is installed, upgrade if needed - brew outdated "$1" || brew upgrade "$@" - else - # Package not installed yet, install. - # If there are conflicts, try overwriting the files (these are in /usr/local anyway so it should be ok). - brew install "$@" || brew link --overwrite gcc49 - fi -} - -# 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' -install_brew_package coreutils - -which cmake &>/dev/null || install_brew_package cmake - -# Install compiler -case "${COMPILER}" in -gcc-4.8) install_brew_package gcc@4.8 ;; -gcc-4.9) install_brew_package gcc@4.9 ;; -gcc-5) install_brew_package gcc@5 ;; -gcc-6) install_brew_package gcc@6 ;; -clang-default) ;; -clang-3.7) install_brew_package llvm@3.7 --with-clang --with-libcxx;; -clang-3.8) install_brew_package llvm@3.8 --with-clang --with-libcxx;; -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/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 -install_brew_package boost --c++11 -install_brew_package python -install_brew_package python3 -travis_fold end brew_install_dependencies