updated workfiles

neo4jrb · Jan 26, 2024 · 722799f · 722799f
1 parent 15f9a15
commit 722799f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/.github/workflows/e2e_test.yml b/.github/workflows/e2e_test.yml
@@ -2,9 +2,9 @@ name: E2E Test
 
 on:
   push:
-    branches: [ '11' ]
+    branches: [ '12' ]
   pull_request:
-    branches: [ '11' ]
+    branches: [ '12' ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -16,10 +16,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ jruby-9.4.5.0, ruby-3.2.3 ]
+        ruby: [ jruby, ruby-3.2.3 ]
         neo4j: [ 5.16.0 ]
         active_model: [ 7.1.3 ]
         # jruby will fail till bug https://github.com/jruby/jruby-openssl/issues/290 is fixed
+        include:
+          - ruby: jruby
+            java-version: 17
     env:
       ACTIVE_MODEL_VERSION: ${{ matrix.active_model }}
       JRUBY_OPTS: --debug -J-Xmx1280m -Xcompile.invokedynamic=false -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -Xcompile.mode=OFF
@@ -34,6 +37,13 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
 
+      - name: Set up Java
+        uses: actions/setup-java@v3
+        if: matrix.java-version
+        with:
+          distribution: 'temurin'
+          java-version: ${{ matrix.java-version }}
+
       - name: Wait for neo4j
         run: while [ $((curl localhost:7474/ > /dev/null 2>&1); echo $?) -ne 0 ]; do sleep 1; done
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ jruby-9.4.5.0, ruby-3.1.4 ]
+        ruby: [ jruby, ruby-3.1.4 ]
         neo4j: [ 5.16.0 ]
         active_model: [ 7.0.8, 7.1.3 ]
         include:
@@ -26,6 +26,8 @@ jobs:
           - ruby: ruby-3.3.0
             neo4j: 5.16.0
             active_model: 7.1.3
+          - ruby: jruby
+            java-version: 17
     env:
       NEO4J_VERSION: ${{ matrix.neo4j }}
       ACTIVE_MODEL_VERSION: ${{ matrix.active_model }}
@@ -41,6 +43,13 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
 
+      - name: Set up Java
+        uses: actions/setup-java@v3
+        if: matrix.java-version
+        with:
+          distribution: 'temurin'
+          java-version: ${{ matrix.java-version }}
+
       - name: Install dependencies
         run: bundle update