summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-02-22 21:29:36 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-02-22 21:29:36 +0000
commitc442dd605b7648bfac4b3c5be4159ad66323b231 (patch)
treea2bec610f5e2cf8da737a44545bc7b60c0960089
parent526cc900922d5a316818bcacbf52b088f561a147 (diff)
merge revision(s) 61605,62359,62361: [Backport #14356]
Try to fix Travis CI configuration. .travis.yml: send notification to #alerts instead of #commits. .travis.yml: resurrect notification to #commits I heard at least Shibata-san sees the channel for the notification. But I want #alets to have all CI failure notifications too. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@62537 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--.travis.yml4
-rw-r--r--version.h6
2 files changed, 6 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index b977ebd7ac..2a86e35be0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -88,7 +88,9 @@ notifications:
- "%{message} by @%{author}: See %{build_url}"
slack:
- secure: TNRGiWGytGSLDAjJLR0NVXKlHhba6Kf584wU7mXqiOCDNBQ0LHUsrIMaL38uvpnzQ6NeV5j5k575LAZyuGXKczSrOTeIBJaHfw6Wj/8WUnifnNcIFozZ5DH9/S2EuiVcslDmoRflOFSTkocpE0MElt2KU2kNCzeq3/iVatNT8Nw=
+ rooms:
+ - secure: i1GLETSKye85ea6dGNA3MxI/5myChmMFiZtBd5C69xK+s1sBFqEgOSbaSf9KHc0CYrHVyNhQMaZRruieV7xS+6Pfs0Zvxf1DO6QQTWC2KhkqwFDLvZncAzjoyASdR90hbr+iRPOngQ+HJuE94zemALAwEqNAinzA74PMiJXktqY= # ruby:<token>#commits
+ - secure: ah7UEHBvncXT7bM5mvYIQAO+tIyV/wl7nXLb7wQD16dO2v8Gragy0mWjB79Q09hrrMGmp6H9bCDpdGS80boIA5EHaHoG4QaP0i9bsSt8U2AMWgZtfyIgQKJ4H2kXkGlrjO+AXTgnIkP7LNjdgAVUUTGQPb26T3QmoN2Splt+fIQ= # ruby:<token>#alerts
on_pull_requests: false
on_success: change
on_failure: always
diff --git a/version.h b/version.h
index 43ba29bc7e..84f97fda6f 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.5.0"
-#define RUBY_RELEASE_DATE "2018-02-22"
-#define RUBY_PATCHLEVEL 30
+#define RUBY_RELEASE_DATE "2018-02-23"
+#define RUBY_PATCHLEVEL 31
#define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 22
+#define RUBY_RELEASE_DAY 23
#include "ruby/version.h"