From 0a2efe6d605aa18f4122ee08a30ebff7959a7429 Mon Sep 17 00:00:00 2001
From: kares <self@kares.org>
Date: Tue, 26 Sep 2023 11:22:23 +0200
Subject: [PATCH] [ci] more (embedded) test on newer Java versions

---
 .github/workflows/ci.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7ef1920b9e0..ba0af1c2609 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -108,8 +108,7 @@ jobs:
     strategy:
       matrix:
         package-flags: ['-Pmain', '-Pdist', '-Pcomplete', '-Posgi', '-Ptest', '-Pmain,test -Dinvoker.test=extended']
-        # dist, complete, and osgi do not pass on 17 yet
-        java-version: ['11']
+        java-version: [8, 11, 21]
       fail-fast: false
 
     name: mvn ${{ matrix.package-flags }} (Java ${{ matrix.java-version }})
@@ -128,25 +127,25 @@ jobs:
         env:
           PHASE: 'package ${{ matrix.package-flags }}'
 
-  mvn-test-8:
+  mvn-test-extended:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        # jruby-jars phase only passes on 8
         package-flags: ['-Pjruby-jars', '-Pjruby-jars,test -Dinvoker.test=extended', '-Pjruby_complete_jar_extended -Dinvoker.skip=true']
+        java-version: [11, 17]
       fail-fast: false
 
-    name: mvn ${{ matrix.package-flags }} (Java 8)
+    name: mvn ${{ matrix.package-flags }} (Java ${{ matrix.java-version }})
 
     steps:
       - name: Bootstrap build
         uses: jruby/jruby-ci-build@v1
-      - name: set up java 8
+      - name: set up java ${{ matrix.java-version }}
         uses: actions/setup-java@v3
         with:
-          distribution: 'zulu'
-          java-version: 8
+          distribution: temurin
+          java-version: ${{ matrix.java-version }}
           cache: 'maven'
       - name: mvn package ${{ matrix.package-flags }}
         run: tool/maven-ci-script.sh
@@ -394,7 +393,7 @@ jobs:
     permissions:
       contents: none
     if: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/jruby-9.3' }}
-    needs: [mvn-test, mvn-test-8, mvn-test-windows, dependency-check, rake-test, rake-test-17-indy, rake-test-8, test-versions, sequel, concurrent-ruby, jruby-tests-dev, regression-specs-jit, mvn-test-m1]
+    needs: [mvn-test, mvn-test-extended, mvn-test-windows, dependency-check, rake-test, rake-test-17-indy, rake-test-8, test-versions, sequel, concurrent-ruby, jruby-tests-dev, regression-specs-jit, mvn-test-m1]
     uses: jruby/jruby/.github/workflows/snapshot-publish.yml@6cd0d4d96d9406635183d81cf91acc82cd78245f
     secrets:
       SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}