[前][次][番号順一覧][スレッド一覧]

ruby-changes:35693

From: hsbt <ko1@a...>
Date: Fri, 3 Oct 2014 23:41:33 +0900 (JST)
Subject: [ruby-changes:35693] hsbt:r47775 (trunk): * .travis.yml: enabled gcc build with osx on travis.

hsbt	2014-10-03 23:41:26 +0900 (Fri, 03 Oct 2014)

  New Revision: 47775

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=47775

  Log:
    * .travis.yml: enabled gcc build with osx on travis.

  Modified files:
    trunk/.travis.yml
    trunk/ChangeLog
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 47774)
+++ ChangeLog	(revision 47775)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Oct  3 23:41:20 2014  SHIBATA Hiroshi  <shibata.hiroshi@g...>
+
+	* .travis.yml: enabled gcc build with osx on travis.
+
 Fri Oct  3 23:22:23 2014  Hiroshi Shirosaki  <h.shirosaki@g...>
 
 	* template/fake.rb.in: fix make install failure due to MSYS path
Index: .travis.yml
===================================================================
--- .travis.yml	(revision 47774)
+++ .travis.yml	(revision 47775)
@@ -29,11 +29,6 @@ os: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L29
   - 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: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L39
   - "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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]