summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-22 09:21:39 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-22 09:21:39 +0000
commitcf33a35a731aca2c3a9d8d7e24e25f3e8e3052f8 (patch)
treeec632b717e0d92c1aa1a540cf72030d56324a225
parent88cbfc0d10f6d449a41127db365389951b87ee51 (diff)
* .travis.yml: Only osx build is enabled. linux builds is random failure
and test results of major linux is covered by rubyci. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47684 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--.travis.yml2
-rw-r--r--ChangeLog5
2 files changed, 6 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 6e8e295..bf5235b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,7 @@ os:
matrix:
allow_failures:
- - os: osx
+ - os: linux
exclude:
- os: osx
compiler: gcc
diff --git a/ChangeLog b/ChangeLog
index eecafaf..9cfbf8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 22 18:21:35 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+
+ * .travis.yml: Only osx build is enabled. linux builds is random failure
+ and test results of major linux is covered by rubyci.
+
Mon Sep 22 12:10:29 2014 Tanaka Akira <akr@fsij.org>
* test/ruby/test_time_tz.rb: Fix test error with tzdata-2014g.