summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2017-12-11 17:19:49 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2017-12-11 17:19:49 +0900
commitc76631d445db1307b50fe89642cf494508153bb8 (patch)
treef4802dc9f0804a9c52d840fc57d4ea91d4d87e93
parent6d42195fb29b193e3e9d8c0d1bdc6109abccf958 (diff)
downloadmruby-c76631d445db1307b50fe89642cf494508153bb8.tar.gz
mruby-c76631d445db1307b50fe89642cf494508153bb8.zip
Update `.travis.yml` to use `gcc-6`
The patch is created by @take_cheese in #3872
-rw-r--r--.travis.yml19
1 files changed, 14 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 8d201515c..771e782e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,27 @@
language: c
-sudo: false
-
matrix:
include:
- os: linux
- sudo: 9000
+ sudo: false
+ dist: trusty
- os: osx
- osx_image: xcode7.1
addons:
apt:
+ sources:
+ - ubuntu-toolchain-r-test
packages:
- gperf
+ - gcc-6
+ - g++-6
-env: MRUBY_CONFIG=travis_config.rb
+env:
+ MRUBY_CONFIG=travis_config.rb
+before_install:
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install gcc@6 ; fi
+ - export CC=gcc-6
+ - export CXX=g++-6
+ - export LD=gcc-6
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export LDFLAGS="-fuse-ld=gold" ; fi
script: "./minirake all test"