Add TruffleRuby support and add it in CI

ruby · May 29, 2023 · e7691e3 · e7691e3
1 parent 806add6
commit e7691e3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,7 +6,6 @@ jobs:
   ruby-versions:
     uses: ruby/actions/.github/workflows/ruby_versions.yml@master
     with:
-      engine: cruby-jruby
       min_version: 2.5
   test:
     needs: ruby-versions

diff --git a/ext/cgi/escape/extconf.rb b/ext/cgi/escape/extconf.rb
@@ -1,3 +1,7 @@
 require 'mkmf'
 
-create_makefile 'cgi/escape'
+if RUBY_ENGINE == 'truffleruby'
+  File.write("Makefile", dummy_makefile($srcdir).join(""))
+else
+  create_makefile 'cgi/escape'
+end
diff --git a/lib/cgi/util.rb b/lib/cgi/util.rb
@@ -90,9 +90,12 @@ def escapeHTML(string)
     end
   end
 
-  begin
-    require 'cgi/escape'
-  rescue LoadError
+  # TruffleRuby runs the pure-Ruby variant faster, do not use the C extension there
+  unless RUBY_ENGINE == 'truffleruby'
+    begin
+      require 'cgi/escape'
+    rescue LoadError
+    end
   end
 
   # Unescape a string that has been HTML-escaped

diff --git a/test/cgi/test_cgi_util.rb b/test/cgi/test_cgi_util.rb
@@ -262,7 +262,7 @@ def setup
       remove_method :escapeHTML
       alias _unescapeHTML unescapeHTML
       remove_method :unescapeHTML
-    end
+    end if defined?(CGI::Escape)
   end
 
   def teardown
@@ -271,7 +271,7 @@ def teardown
       remove_method :_escapeHTML
       alias unescapeHTML _unescapeHTML
       remove_method :_unescapeHTML
-    end
+    end if defined?(CGI::Escape)
   end
 
   def test_cgi_escapeHTML_with_invalid_byte_sequence