Commit c0cbb673 authored by scoder's avatar scoder Committed by GitHub

Merge pull request #1977 from xoviat/travis

[travis] update gcc
parents 13ab4d8a 53108c0d
...@@ -4,10 +4,14 @@ sudo: false ...@@ -4,10 +4,14 @@ sudo: false
addons: addons:
apt: apt:
sources:
- ubuntu-toolchain-r-test
packages: packages:
- gdb - gdb
- python-dbg - python-dbg
- python3-dbg - python3-dbg
- gcc-6
- g++-6
cache: cache:
pip: true pip: true
...@@ -33,7 +37,7 @@ env: ...@@ -33,7 +37,7 @@ env:
- CCACHE_SLOPPINESS=pch_defines,time_macros - CCACHE_SLOPPINESS=pch_defines,time_macros
- CCACHE_COMPRESS=1 - CCACHE_COMPRESS=1
- CCACHE_MAXSIZE=100M - CCACHE_MAXSIZE=100M
- PATH="/usr/lib/ccache:$PATH" - PATH="/usr/lib/ccache:$HOME/gcc-symlinks:$PATH"
matrix: matrix:
- BACKEND=c - BACKEND=c
- BACKEND=cpp - BACKEND=cpp
...@@ -84,6 +88,15 @@ branches: ...@@ -84,6 +88,15 @@ branches:
- release - release
before_install: before_install:
- |
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
mkdir "$HOME/gcc-symlinks"
ln -s /usr/bin/gcc-6 $HOME/gcc-symlinks/gcc
ln -s /usr/bin/g++-6 $HOME/gcc-symlinks/g++
gcc --version
fi
- | - |
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then # Install Miniconda if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then # Install Miniconda
curl -s -o miniconda.sh https://repo.continuum.io/miniconda/Miniconda$PY-latest-MacOSX-x86_64.sh; curl -s -o miniconda.sh https://repo.continuum.io/miniconda/Miniconda$PY-latest-MacOSX-x86_64.sh;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment