diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2017-12-12 22:31:14 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2017-12-12 22:31:14 +0900 |
| commit | c6ea9480300a45e9611ac6640022b9d913c4a31e (patch) | |
| tree | 1b85c6f965781ff6f9b7216ec4d9b0d2a0e0204a /.travis.yml | |
| parent | 346ebfb0ea6ecd259af91c136e37280ea0296020 (diff) | |
| download | mruby-c6ea9480300a45e9611ac6640022b9d913c4a31e.tar.gz mruby-c6ea9480300a45e9611ac6640022b9d913c4a31e.zip | |
Revert "Update `.travis.yml` to use `gcc-6`"
This change caused Travis CI errors on OSX. This reverts
commit c76631d445db1307b50fe89642cf494508153bb8.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index d9e2fa50a..56c54914a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,27 +1,20 @@ language: c +sudo: false + matrix: include: - os: linux - sudo: false - dist: trusty + sudo: 9000 - 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 -before_install: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install gcc@6 || breq link --overwrite 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 +env: MRUBY_CONFIG=travis_config.rb script: "./minirake all test" |