diff options
| author | TitanSnow <[email protected]> | 2017-05-15 10:36:59 +0800 |
|---|---|---|
| committer | TitanSnow <[email protected]> | 2017-05-15 10:36:59 +0800 |
| commit | 9303ab1776b52e0177dee52fb3bd2c249fda3d67 (patch) | |
| tree | 660577cbe9bf538ecdbde154fcb80a192bd34d22 | |
| parent | 408e9f0197194f6c5d7e6abd86ef4a0b988338c1 (diff) | |
| parent | 98388a83e5ea304ea48056b61452eceec0f8bb38 (diff) | |
Merge branch 'upgradegcc' into luacov
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index f0d45a355..0aa161d1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ before_install: install: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install dmd rust; fi - - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; sudo apt-get update -q; sudo apt-get install -yq gcc-6; sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-6 99; gcov --version; fi + - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get autoremove -yq gcc g++; sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; sudo apt-get update -q; sudo apt-get install -yq gcc-6 g++-6; sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 99 --slave /usr/bin/gcov gcov /usr/bin/gcov-6 --slave /usr/bin/g++ g++ /usr/bin/g++-6; gcc --version; g++ --version; gcov --version; fi script: - scripts/get.sh __local__ |