sp
/
tempest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Changed compilers in travis

tempestpy_adaptions
Matthias Volk 7 years ago
parent
1ec19a1e6c
commit
bc0e432e11
5 changed files with 56 additions and 96 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 74
      .travis.yml
  2. 51
      travis/build-helper.sh
  3. 6
      travis/generate_travis.py
  4. 2
      travis/install_linux.sh
  5. 19
      travis/install_osx.sh

74
.travis.yml
View File

@ -7,6 +7,7 @@ branches:
only: only:
- master - master
- stable - stable
sudo: required
dist: trusty dist: trusty
language: cpp language: cpp
@ -20,7 +21,6 @@ cache:
# Enable docker support # Enable docker support
services: services:
- docker - docker
sudo: required
notifications: notifications:
email: email:
@ -42,8 +42,8 @@ jobs:
# osx # osx
- stage: Build (1st run) - stage: Build (1st run)
os: osx os: osx
compiler: clang
env: CONFIG=DefaultDebug COMPILER=clang-4.0 STL=libc++
compiler: apple-clang
env: CONFIG=DefaultDebug COMPILER=apple-clang STL=libc++
install: install:
- rm -rf build - rm -rf build
- travis/install_osx.sh - travis/install_osx.sh
@ -53,8 +53,8 @@ jobs:
- find build -iname '*err*.log' -type f -print -exec cat {} \; - find build -iname '*err*.log' -type f -print -exec cat {} \;
- stage: Build (1st run) - stage: Build (1st run)
os: osx os: osx
compiler: clang
env: CONFIG=DefaultRelease COMPILER=clang-4.0 STL=libc++
compiler: apple-clang
env: CONFIG=DefaultRelease COMPILER=apple-clang STL=libc++
install: install:
- rm -rf build - rm -rf build
- travis/install_osx.sh - travis/install_osx.sh
@ -66,7 +66,7 @@ jobs:
- stage: Build (1st run) - stage: Build (1st run)
os: linux os: linux
compiler: gcc compiler: gcc
env: CONFIG=DefaultDebug LINUX=ubuntu-16.10 COMPILER=gcc-6
env: CONFIG=DefaultDebug LINUX=ubuntu-16.10 COMPILER=gcc
install: install:
- rm -rf build - rm -rf build
- travis/install_linux.sh - travis/install_linux.sh
@ -79,7 +79,7 @@ jobs:
- stage: Build (1st run) - stage: Build (1st run)
os: linux os: linux
compiler: gcc compiler: gcc
env: CONFIG=DefaultRelease LINUX=ubuntu-16.10 COMPILER=gcc-6
env: CONFIG=DefaultRelease LINUX=ubuntu-16.10 COMPILER=gcc
install: install:
- rm -rf build - rm -rf build
- travis/install_linux.sh - travis/install_linux.sh
@ -97,8 +97,8 @@ jobs:
# osx # osx
- stage: Build (2nd run) - stage: Build (2nd run)
os: osx os: osx
compiler: clang
env: CONFIG=DefaultDebug COMPILER=clang-4.0 STL=libc++
compiler: apple-clang
env: CONFIG=DefaultDebug COMPILER=apple-clang STL=libc++
install: install:
- travis/install_osx.sh - travis/install_osx.sh
script: script:
@ -107,8 +107,8 @@ jobs:
- find build -iname '*err*.log' -type f -print -exec cat {} \; - find build -iname '*err*.log' -type f -print -exec cat {} \;
- stage: Build (2nd run) - stage: Build (2nd run)
os: osx os: osx
compiler: clang
env: CONFIG=DefaultRelease COMPILER=clang-4.0 STL=libc++
compiler: apple-clang
env: CONFIG=DefaultRelease COMPILER=apple-clang STL=libc++
install: install:
- travis/install_osx.sh - travis/install_osx.sh
script: script:
@ -119,7 +119,7 @@ jobs:
- stage: Build (2nd run) - stage: Build (2nd run)
os: linux os: linux
compiler: gcc compiler: gcc
env: CONFIG=DefaultDebug LINUX=ubuntu-16.10 COMPILER=gcc-6
env: CONFIG=DefaultDebug LINUX=ubuntu-16.10 COMPILER=gcc
install: install:
- travis/install_linux.sh - travis/install_linux.sh
script: script:
@ -131,7 +131,7 @@ jobs:
- stage: Build (2nd run) - stage: Build (2nd run)
os: linux os: linux
compiler: gcc compiler: gcc
env: CONFIG=DefaultRelease LINUX=ubuntu-16.10 COMPILER=gcc-6
env: CONFIG=DefaultRelease LINUX=ubuntu-16.10 COMPILER=gcc
install: install:
- travis/install_linux.sh - travis/install_linux.sh
script: script:
@ -148,8 +148,8 @@ jobs:
# osx # osx
- stage: Build (3rd run) - stage: Build (3rd run)
os: osx os: osx
compiler: clang
env: CONFIG=DefaultDebug COMPILER=clang-4.0 STL=libc++
compiler: apple-clang
env: CONFIG=DefaultDebug COMPILER=apple-clang STL=libc++
install: install:
- travis/install_osx.sh - travis/install_osx.sh
script: script:
@ -158,8 +158,8 @@ jobs:
- find build -iname '*err*.log' -type f -print -exec cat {} \; - find build -iname '*err*.log' -type f -print -exec cat {} \;
- stage: Build (3rd run) - stage: Build (3rd run)
os: osx os: osx
compiler: clang
env: CONFIG=DefaultRelease COMPILER=clang-4.0 STL=libc++
compiler: apple-clang
env: CONFIG=DefaultRelease COMPILER=apple-clang STL=libc++
install: install:
- travis/install_osx.sh - travis/install_osx.sh
script: script:
@ -170,7 +170,7 @@ jobs:
- stage: Build (3rd run) - stage: Build (3rd run)
os: linux os: linux
compiler: gcc compiler: gcc
env: CONFIG=DefaultDebug LINUX=ubuntu-16.10 COMPILER=gcc-6
env: CONFIG=DefaultDebug LINUX=ubuntu-16.10 COMPILER=gcc
install: install:
- travis/install_linux.sh - travis/install_linux.sh
script: script:
@ -182,7 +182,7 @@ jobs:
- stage: Build (3rd run) - stage: Build (3rd run)
os: linux os: linux
compiler: gcc compiler: gcc
env: CONFIG=DefaultRelease LINUX=ubuntu-16.10 COMPILER=gcc-6
env: CONFIG=DefaultRelease LINUX=ubuntu-16.10 COMPILER=gcc
install: install:
- travis/install_linux.sh - travis/install_linux.sh
script: script:
@ -199,8 +199,8 @@ jobs:
# osx # osx
- stage: Build (4th run) - stage: Build (4th run)
os: osx os: osx
compiler: clang
env: CONFIG=DefaultDebug COMPILER=clang-4.0 STL=libc++
compiler: apple-clang
env: CONFIG=DefaultDebug COMPILER=apple-clang STL=libc++
install: install:
- travis/install_osx.sh - travis/install_osx.sh
script: script:
@ -209,8 +209,8 @@ jobs:
- find build -iname '*err*.log' -type f -print -exec cat {} \; - find build -iname '*err*.log' -type f -print -exec cat {} \;
- stage: Build (4th run) - stage: Build (4th run)
os: osx os: osx
compiler: clang
env: CONFIG=DefaultRelease COMPILER=clang-4.0 STL=libc++
compiler: apple-clang
env: CONFIG=DefaultRelease COMPILER=apple-clang STL=libc++
install: install:
- travis/install_osx.sh - travis/install_osx.sh
script: script:
@ -221,7 +221,7 @@ jobs:
- stage: Build (4th run) - stage: Build (4th run)
os: linux os: linux
compiler: gcc compiler: gcc
env: CONFIG=DefaultDebug LINUX=ubuntu-16.10 COMPILER=gcc-6
env: CONFIG=DefaultDebug LINUX=ubuntu-16.10 COMPILER=gcc
install: install:
- travis/install_linux.sh - travis/install_linux.sh
script: script:
@ -233,7 +233,7 @@ jobs:
- stage: Build (4th run) - stage: Build (4th run)
os: linux os: linux
compiler: gcc compiler: gcc
env: CONFIG=DefaultRelease LINUX=ubuntu-16.10 COMPILER=gcc-6
env: CONFIG=DefaultRelease LINUX=ubuntu-16.10 COMPILER=gcc
install: install:
- travis/install_linux.sh - travis/install_linux.sh
script: script:
@ -250,8 +250,8 @@ jobs:
# osx # osx
- stage: Build (5th run) - stage: Build (5th run)
os: osx os: osx
compiler: clang
env: CONFIG=DefaultDebug COMPILER=clang-4.0 STL=libc++
compiler: apple-clang
env: CONFIG=DefaultDebug COMPILER=apple-clang STL=libc++
install: install:
- travis/install_osx.sh - travis/install_osx.sh
script: script:
@ -260,8 +260,8 @@ jobs:
- find build -iname '*err*.log' -type f -print -exec cat {} \; - find build -iname '*err*.log' -type f -print -exec cat {} \;
- stage: Build (5th run) - stage: Build (5th run)
os: osx os: osx
compiler: clang
env: CONFIG=DefaultRelease COMPILER=clang-4.0 STL=libc++
compiler: apple-clang
env: CONFIG=DefaultRelease COMPILER=apple-clang STL=libc++
install: install:
- travis/install_osx.sh - travis/install_osx.sh
script: script:
@ -272,7 +272,7 @@ jobs:
- stage: Build (5th run) - stage: Build (5th run)
os: linux os: linux
compiler: gcc compiler: gcc
env: CONFIG=DefaultDebug LINUX=ubuntu-16.10 COMPILER=gcc-6
env: CONFIG=DefaultDebug LINUX=ubuntu-16.10 COMPILER=gcc
install: install:
- travis/install_linux.sh - travis/install_linux.sh
script: script:
@ -284,7 +284,7 @@ jobs:
- stage: Build (5th run) - stage: Build (5th run)
os: linux os: linux
compiler: gcc compiler: gcc
env: CONFIG=DefaultRelease LINUX=ubuntu-16.10 COMPILER=gcc-6
env: CONFIG=DefaultRelease LINUX=ubuntu-16.10 COMPILER=gcc
install: install:
- travis/install_linux.sh - travis/install_linux.sh
script: script:
@ -301,8 +301,8 @@ jobs:
# osx # osx
- stage: Test all - stage: Test all
os: osx os: osx
compiler: clang
env: CONFIG=DefaultDebug COMPILER=clang-4.0 STL=libc++
compiler: apple-clang
env: CONFIG=DefaultDebug COMPILER=apple-clang STL=libc++
install: install:
- travis/install_osx.sh - travis/install_osx.sh
script: script:
@ -311,8 +311,8 @@ jobs:
- find build -iname '*err*.log' -type f -print -exec cat {} \; - find build -iname '*err*.log' -type f -print -exec cat {} \;
- stage: Test all - stage: Test all
os: osx os: osx
compiler: clang
env: CONFIG=DefaultRelease COMPILER=clang-4.0 STL=libc++
compiler: apple-clang
env: CONFIG=DefaultRelease COMPILER=apple-clang STL=libc++
install: install:
- travis/install_osx.sh - travis/install_osx.sh
script: script:
@ -323,7 +323,7 @@ jobs:
- stage: Test all - stage: Test all
os: linux os: linux
compiler: gcc compiler: gcc
env: CONFIG=DefaultDebug LINUX=ubuntu-16.10 COMPILER=gcc-6
env: CONFIG=DefaultDebug LINUX=ubuntu-16.10 COMPILER=gcc
install: install:
- travis/install_linux.sh - travis/install_linux.sh
script: script:
@ -335,7 +335,7 @@ jobs:
- stage: Test all - stage: Test all
os: linux os: linux
compiler: gcc compiler: gcc
env: CONFIG=DefaultRelease LINUX=ubuntu-16.10 COMPILER=gcc-6
env: CONFIG=DefaultRelease LINUX=ubuntu-16.10 COMPILER=gcc
install: install:
- travis/install_linux.sh - travis/install_linux.sh
script: script:

51
travis/build-helper.sh
View File

@ -66,57 +66,17 @@ run() {
export PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH" export PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"
case $COMPILER in case $COMPILER in
gcc-4.8)
export CC=gcc-4.8
export CXX=g++-4.8
;;
gcc-4.9)
export CC=gcc-4.9
export CXX=g++-4.9
;;
gcc-5)
export CC=gcc-5
export CXX=g++-5
;;
gcc-6) gcc-6)
export CC=gcc-6 export CC=gcc-6
export CXX=g++-6 export CXX=g++-6
;; ;;
gcc-default)
gcc)
export CC=gcc export CC=gcc
export CXX=g++ export CXX=g++
;; ;;
clang-3.5)
export CC=clang-3.5
export CXX=clang++-3.5
;;
clang-3.6)
export CC=clang-3.6
export CXX=clang++-3.6
;;
clang-3.7)
export CC=clang-3.7
export CXX=clang++-3.7
;;
clang-3.8)
export CC=clang-3.8
export CXX=clang++-3.8
;;
clang-3.9)
export CC=clang-3.9
export CXX=clang++-3.9
;;
clang-4.0)
clang-4)
case "$OS" in case "$OS" in
linux) linux)
export CC=clang-4.0 export CC=clang-4.0
@ -130,7 +90,12 @@ clang-4.0)
esac esac
;; ;;
clang-default)
clang)
export CC=clang
export CXX=clang++
;;
apple-clang)
export CC=clang export CC=clang
export CXX=clang++ export CXX=clang++
;; ;;

6
travis/generate_travis.py
View File

@ -2,14 +2,14 @@
# Configuration for Linux # Configuration for Linux
configs_linux = [ configs_linux = [
# OS, compiler # OS, compiler
("ubuntu-16.10", "gcc", "-6"),
("ubuntu-16.10", "gcc", ""),
#("debian-9", "gcc", "-6"), #("debian-9", "gcc", "-6"),
] ]
# Configurations for Mac # Configurations for Mac
configs_mac = [ configs_mac = [
# OS, compiler # OS, compiler
("osx", "clang", "-4.0"),
("osx", "apple-clang", ""),
] ]
# Build types # Build types
@ -41,6 +41,7 @@ if __name__ == "__main__":
s += " only:\n" s += " only:\n"
s += " - master\n" s += " - master\n"
s += " - stable\n" s += " - stable\n"
s += "sudo: required\n"
s += "dist: trusty\n" s += "dist: trusty\n"
s += "language: cpp\n" s += "language: cpp\n"
s += "\n" s += "\n"
@ -54,7 +55,6 @@ if __name__ == "__main__":
s += "# Enable docker support\n" s += "# Enable docker support\n"
s += "services:\n" s += "services:\n"
s += "- docker\n" s += "- docker\n"
s += "sudo: required\n"
s += "\n" s += "\n"
s += "notifications:\n" s += "notifications:\n"

2
travis/install_linux.sh
View File

@ -8,4 +8,4 @@ then
exit 0 exit 0
fi fi
sudo apt-get install -qq -y docker
#sudo apt-get install -qq -y docker

19
travis/install_osx.sh
View File

@ -18,8 +18,7 @@ install_brew_package() {
brew outdated "$1" || brew upgrade "$@" brew outdated "$1" || brew upgrade "$@"
else else
# Package not installed yet, install. # 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
brew install "$@" || brew link --overwrite "$@"
fi fi
} }
@ -40,19 +39,15 @@ install_brew_package md5sha1sum
# For `timeout' # For `timeout'
install_brew_package coreutils install_brew_package coreutils
which cmake &>/dev/null || install_brew_package cmake
install_brew_package cmake
# Install compiler # Install compiler
case "${COMPILER}" in 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;;
gcc) install_brew_package gcc ;;
gcc-6) install_brew_package gcc@6 ;;
clang) install_brew_package llvm --with-clang --with-libcxx;;
clang-4) install_brew_package llvm@4 --with-clang --with-libcxx;;
apple-clang) ;;
*) echo "Compiler not supported: ${COMPILER}. See travis/install_osx.sh"; exit 1 ;; *) echo "Compiler not supported: ${COMPILER}. See travis/install_osx.sh"; exit 1 ;;
esac esac
travis_fold end brew_install_util travis_fold end brew_install_util

Write Preview
Loading…
Cancel
Save