1
0
mirror of https://github.com/aportelli/LatAnalyze.git synced 2025-04-11 03:20:46 +01:00

more Travis fix

This commit is contained in:
Antonin Portelli 2019-02-06 15:04:40 +00:00
parent 6dd82f33dc
commit f8ad5c4da0

View File

@ -13,7 +13,7 @@ matrix:
- os: osx - os: osx
osx_image: xcode10.1 osx_image: xcode10.1
compiler: gcc compiler: gcc
env: VERSION=7 env: VERSION=-7
- compiler: gcc - compiler: gcc
addons: addons:
apt: apt:
@ -24,7 +24,7 @@ matrix:
- libgsl0-dev - libgsl0-dev
- flex - flex
- bison - bison
env: VERSION=6 env: VERSION=-6
- compiler: gcc - compiler: gcc
addons: addons:
apt: apt:
@ -35,7 +35,7 @@ matrix:
- libgsl0-dev - libgsl0-dev
- flex - flex
- bison - bison
env: VERSION=7 env: VERSION=-7
- compiler: clang - compiler: clang
addons: addons:
apt: apt:
@ -68,11 +68,11 @@ before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gsl; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gsl; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install bison flex; export PATH="/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH"; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install bison flex; export PATH="/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH"; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew install gcc$VERSION; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew install gcc${VERSION#-}; fi
install: install:
- export CC=$CC-$VERSION - export CC=$CC$VERSION
- export CXX=$CXX-$VERSION - export CXX=$CXX$VERSION
- echo $PATH - echo $PATH
- which $CC - which $CC
- $CC --version - $CC --version