Changeset 2300


Ignore:
Timestamp:
Oct 6, 2016 5:10:41 AM (21 months ago)
Author:
tkr
Message:

Merging r2299 from trunk

Location:
stable/2.9
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/2.9

  • stable/2.9/.travis.yml

    r2288 r2300  
    2828before_script:
    2929  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then  export PLATFORM=osx$OSX-x86_64-clang`clang -dumpversion`; fi
    30   - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$OSX" == "10.10" ]]; then brew update; brew install gcc; export PLATFORM=osx10.10-x86_64-clang`clang -dumpversion`; fi
     30  - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$OSX" == "10.10" || "$OSX" == "10.11" ]]; then brew update; brew install gcc; export PLATFORM=osx10.10-x86_64-clang`clang -dumpversion`; fi
    3131  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export PLATFORM=linux-x86_64-gcc`gcc -dumpversion`; fi
    3232  - git clone --branch=stable/0.8 https://github.com/coin-or-tools/BuildTools
Note: See TracChangeset for help on using the changeset viewer.