File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -699,7 +699,6 @@ jobs:
699699
700700 jruby-package :
701701 needs : ["rcd_image_version"]
702- name : " jruby-package"
703702 runs-on : ubuntu-latest
704703 container :
705704 image : " ghcr.io/rake-compiler/rake-compiler-dock-image:${{needs.rcd_image_version.outputs.rcd_image_version}}-jruby"
@@ -719,17 +718,19 @@ jobs:
719718 strategy :
720719 fail-fast : false
721720 matrix :
722- ruby : ["jruby-9.4"]
721+ jruby : ["9.4"]
722+ jre : ["8", "11"]
723+ name : " jruby-${{matrix.jruby}}-jre${{matrix.jre}}-install"
723724 runs-on : ubuntu-latest
724725 steps :
725726 - uses : actions/checkout@v3
726727 with :
727728 submodules : true
728- - uses : ruby/setup-ruby@v1
729- with :
730- ruby-version : " ${{matrix.ruby}}"
731729 - uses : actions/download-artifact@v3
732730 with :
733731 name : jruby-gem
734732 path : gems
735- - run : ./scripts/test-gem-install gems
733+ - run : |
734+ docker run --rm -v "$(pwd):/nokogiri" -w /nokogiri \
735+ jruby:${{matrix.jruby}}-jre${{matrix.jre}} \
736+ ./scripts/test-gem-install gems
Original file line number Diff line number Diff line change @@ -362,6 +362,12 @@ namespace "gem" do
362362end
363363
364364if java?
365+ # append to the existing "java" task defined by rake-compiler
366+ task "java" do # rubocop:disable Rake/Desc
367+ # if we're building the java gem, don't build the vanilla gem (see rakelib/package.rake)
368+ Rake ::Task [ "pkg/#{ NOKOGIRI_SPEC . full_name } .gem" ] . clear
369+ end
370+
365371 require "rake/javaextensiontask"
366372 Rake ::JavaExtensionTask . new ( "nokogiri" , NOKOGIRI_SPEC . dup ) do |ext |
367373 # Keep the extension C files because they have docstrings (and Java files don't)
You can’t perform that action at this time.
0 commit comments