summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2020-12-31 18:34:09 +0900
committernagachika <nagachika@ruby-lang.org>2020-12-31 18:34:09 +0900
commitd0693391103672b7fc3976e5ae8ae414059b3e97 (patch)
tree3b09f1c3edbbaed084fb5d51ccb18a34b808d4bf /version.h
parent5cbba4d6005a03914fc47e7a65ae5b6ef76c8e29 (diff)
merge revision(s) ed549f80b645aafd62376f65c3a27b66bafa2a38,eff0c5bf2ad47d10a440c5211be5eddb3bbf4028,f6b6a7ad345c50eeb3f7206ceabdf41ba94b7d85,5b48686691c2443d8d7113e593494c4d9302da0e,2af4c1fc5b19fc96203c2d7e917e689510d3527e,c9213aa864fb8527388679c21f1ea8ce129e2f1a,224f29c8e92094af10bc666c474b81a3545d6adf:
spec/ruby/core/process/clock_getres_spec.rb: skip on Android in the same way as FreeBSD and OpenBSD. I guess that the spec makes too strong assumption. Try to avoid random failures on clock_getres_spec.rb This spec fails too often https://github.com/ruby/ruby/runs/529546249 https://github.com/ruby/ruby/runs/524933256 Show failed times Remove Process.clock_getres "matches the resolution in practice" specs * Almost all platforms return incorrect values for Process.clock_getres, it should be removed: https://bugs.ruby-lang.org/issues/16740 Skip Process#clock_getres specs on Android ... just like AIX and OpenBSD. Update to ruby/spec@d394dfd spec/ruby/core/process/clock_getres_spec.rb: lax the resolution limit Android is Linux, but the clock resolution is 10 milliseconds. I think that 1 microsecond is too strict for embedded environment. This change laxes the limit to 10 milliseconds.
Diffstat (limited to 'version.h')
-rw-r--r--version.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/version.h b/version.h
index e852c18e1d..fa6b79c666 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 3
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 145
+#define RUBY_PATCHLEVEL 146
#define RUBY_RELEASE_YEAR 2020
#define RUBY_RELEASE_MONTH 12