From ff2c9963e982af90b2ecfb13fc598a20ca894d3c Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike.dalessio@gmail.com>
Date: Tue, 23 May 2023 12:33:39 -0400
Subject: [PATCH] ci: test installed gem on java 8

---
 .github/workflows/ci.yml | 13 +++++++------
 rakelib/extensions.rake  |  6 ++++++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f08f9949c8..c0863dba18 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -699,7 +699,6 @@ jobs:
 
   jruby-package:
     needs: ["rcd_image_version"]
-    name: "jruby-package"
     runs-on: ubuntu-latest
     container:
       image: "ghcr.io/rake-compiler/rake-compiler-dock-image:${{needs.rcd_image_version.outputs.rcd_image_version}}-jruby"
@@ -719,17 +718,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["jruby-9.4"]
+        jruby: ["9.4"]
+        jre: ["8", "11"]
+    name: "jruby-${{matrix.jruby}}-jre${{matrix.jre}}-install"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: true
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: "${{matrix.ruby}}"
       - uses: actions/download-artifact@v3
         with:
           name: jruby-gem
           path: gems
-      - run: ./scripts/test-gem-install gems
+      - run: |
+          docker run --rm -v "$(pwd):/nokogiri" -w /nokogiri \
+            jruby:${{matrix.jruby}}-jre${{matrix.jre}} \
+            ./scripts/test-gem-install gems
diff --git a/rakelib/extensions.rake b/rakelib/extensions.rake
index 963eb15381..cde66b2e0e 100644
--- a/rakelib/extensions.rake
+++ b/rakelib/extensions.rake
@@ -362,6 +362,12 @@ namespace "gem" do
 end
 
 if java?
+  # append to the existing "java" task defined by rake-compiler
+  task "java" do # rubocop:disable Rake/Desc
+    # if we're building the java gem, don't build the vanilla gem (see rakelib/package.rake)
+    Rake::Task["pkg/#{NOKOGIRI_SPEC.full_name}.gem"].clear
+  end
+
   require "rake/javaextensiontask"
   Rake::JavaExtensionTask.new("nokogiri", NOKOGIRI_SPEC.dup) do |ext|
     # Keep the extension C files because they have docstrings (and Java files don't)