summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-03-06 07:31:29 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-03-06 07:31:29 +0000
commit32f7b501bb269ba3459227323cfb8d1b0f1cdbe9 (patch)
tree630dab23b528951d9661d777bde9cbea45ec8973
parent470a7046d45b4a16c457698137326c8ce212d459 (diff)
merge revision(s) 67172:
Remove deprecated `sudo: false` in .travis.yml - https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration - https://docs.travis-ci.com/user/reference/overview/#deprecated-virtualization-environments git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67178 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--.travis.yml3
-rw-r--r--version.h2
2 files changed, 1 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 2084634390..532d7f16b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,8 +22,6 @@ dist: xenial
osx_image: xcode10.1
-sudo: false
-
git:
quiet: true
@@ -195,7 +193,6 @@ env:
- &i686-linux
name: i686-linux
<<: *linux
- sudo: required
env:
- GCC_FLAGS=-m32
- debugflags=-g0
diff --git a/version.h b/version.h
index 02add458dc..7b2cd63ed6 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.6.1"
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 35
+#define RUBY_PATCHLEVEL 36
#define RUBY_RELEASE_YEAR 2019
#define RUBY_RELEASE_MONTH 3