summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-03-29 10:05:57 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-03-29 10:05:57 +0000
commit2ba6862f77e8b62fd08357a6a1f2e28546eb4eca (patch)
treeaf7fd63c58a8bc6163263d4558105ac6fbe10bc8
parent56765c559e73a9f9db5bb51a1ab9a994f33597ef (diff)
merge revision(s) 61470:
Add ruby_2_5 branch to .travis.yml git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@63035 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--.travis.yml1
-rw-r--r--version.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 2a86e35be0..a9117d190f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -73,6 +73,7 @@ branches:
- ruby_2_2
- ruby_2_3
- ruby_2_4
+ - ruby_2_5
- /^feature\//
- /^bug\//
diff --git a/version.h b/version.h
index e474bbc85e..ddb904cbb0 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.5.1"
#define RUBY_RELEASE_DATE "2018-03-29"
-#define RUBY_PATCHLEVEL 57
+#define RUBY_PATCHLEVEL 58
#define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 3