summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/lib/jit_support.rb8
-rw-r--r--version.h2
2 files changed, 8 insertions, 2 deletions
diff --git a/test/lib/jit_support.rb b/test/lib/jit_support.rb
index 5e47ff45e3..8d17ed9552 100644
--- a/test/lib/jit_support.rb
+++ b/test/lib/jit_support.rb
@@ -7,6 +7,12 @@ module JITSupport
%r[\A.*/bin/intel64/icc\b],
%r[\A/opt/developerstudio\d+\.\d+/bin/cc\z],
]
+ # freebsd12: cc1 internal failure https://rubyci.org/logs/rubyci.s3.amazonaws.com/freebsd12/ruby-master/log/20200306T103003Z.fail.html.gz
+ # rhel8: one or more PCH files were found, but they were invalid https://rubyci.org/logs/rubyci.s3.amazonaws.com/rhel8/ruby-master/log/20200306T153003Z.fail.html.gz
+ PENDING_RUBYCI_NICKNAMES = %w[
+ freebsd12
+ rhel8
+ ]
module_function
# Run Ruby script with --jit-wait (Synchronous JIT compilation).
@@ -45,7 +51,7 @@ module JITSupport
return @supported if defined?(@supported)
@supported = UNSUPPORTED_COMPILERS.all? do |regexp|
!regexp.match?(RbConfig::CONFIG['MJIT_CC'])
- end && RbConfig::CONFIG["MJIT_SUPPORT"] != 'no'
+ end && RbConfig::CONFIG["MJIT_SUPPORT"] != 'no' && !PENDING_RUBYCI_NICKNAMES.include?(ENV['RUBYCI_NICKNAME'])
end
def remove_mjit_logs(stderr)
diff --git a/version.h b/version.h
index 2cd5605b79..6418e302ff 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.6.6"
#define RUBY_RELEASE_DATE "2020-03-20"
-#define RUBY_PATCHLEVEL 140
+#define RUBY_PATCHLEVEL 141
#define RUBY_RELEASE_YEAR 2020
#define RUBY_RELEASE_MONTH 3