summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-31 01:16:48 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-31 01:16:48 +0000
commitf17a28dda01dbc40301b7e30355aadefd87985ff (patch)
tree0a3169b0a3dd3a5784c571a0c2c7d43a9b990425
parentf288185d46ff183abb4279ae596806dc64b46bf4 (diff)
* .travis.yml: reverted r48199, it's unlated configuration.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48203 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--.travis.yml3
-rw-r--r--ChangeLog4
2 files changed, 5 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 63e70d77ff..154c2ff16d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,10 +57,9 @@ before_script:
- "make reconfig"
- "cp -pr config.status .ext/include config_2nd"
- "diff -ru config_1st config_2nd || true"
- - "make update-unicode"
- - "make update-rubyspec"
- "make -s $JOBS encs"
- "make -s $JOBS exts"
+ - "make update-rubyspec"
script:
- "make test"
- "make test-all TESTS='-q -j2'"
diff --git a/ChangeLog b/ChangeLog
index 8eb3116181..fef10742a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Oct 31 10:16:42 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+
+ * .travis.yml: reverted r48199, it's unlated configuration.
+
Fri Oct 31 09:58:14 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* test/test_unicode_normalize.rb: added unicode version number to