mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* .travis.yml: enabled gcc build with osx on travis.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47775 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
438fb66969
commit
5eed468b8a
2 changed files with 6 additions and 5 deletions
|
@ -29,11 +29,6 @@ os:
|
|||
- linux
|
||||
- osx
|
||||
|
||||
matrix:
|
||||
exclude:
|
||||
- os: osx
|
||||
compiler: gcc
|
||||
|
||||
# Dependencies. Some header files are missing in a Travis' worker VM, so we
|
||||
# have to install them. The "1.9.1" here is OK. It is the most adopted
|
||||
# version string for Debian/Ubuntu, and no dependencies have been changed so
|
||||
|
@ -44,6 +39,8 @@ before_install:
|
|||
- "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then JOBS='-j'; fi"
|
||||
- "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then brew install autoconf openssl; fi"
|
||||
- "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then OPENSSL_FLAG=\"--with-openssl-dir=`brew --prefix openssl`\"; fi"
|
||||
- "if [[ $TRAVIS_OS_NAME = 'osx' && $CC = 'gcc' ]]; then brew install gcc; fi"
|
||||
- "if [[ $TRAVIS_OS_NAME = 'osx' && $CC = 'gcc' ]]; then CC='gcc-4.9'; fi"
|
||||
install: "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then sudo apt-get -qq build-dep ruby1.9.1 2>/dev/null; fi"
|
||||
|
||||
# Script is where the test runs. Note we just do "make test", not other tests
|
||||
|
|
|
@ -1,3 +1,7 @@
|
|||
Fri Oct 3 23:41:20 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
|
||||
|
||||
* .travis.yml: enabled gcc build with osx on travis.
|
||||
|
||||
Fri Oct 3 23:22:23 2014 Hiroshi Shirosaki <h.shirosaki@gmail.com>
|
||||
|
||||
* template/fake.rb.in: fix make install failure due to MSYS path
|
||||
|
|
Loading…
Reference in a new issue