From 7664368caa80611a988946837f1b30320c873a91 Mon Sep 17 00:00:00 2001
From: Colin Dean <colin.dean@target.com>
Date: Wed, 10 Apr 2024 18:19:13 -0400
Subject: [PATCH] Continue testing on JDK1.8 for legacy DV on Spark 2.3

---
 .github/workflows/ci.yaml      |  9 +++++----
 .github/workflows/release.yaml | 11 ++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 7006578..2d28a0f 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -20,6 +20,11 @@ jobs:
       - uses: coursier/cache-action@v6
         with:
           extraKey: ${{ runner.os }}
+      - uses: coursier/setup-action@v1
+        with:
+          jvm: adopt:1.8
+      - name: Build, test, and package project on "legacy" Spark
+        run: bin/sbt clean compile test package makePom
       - uses: coursier/setup-action@v1
         with:
           jvm: adoptium:1.17
@@ -27,7 +32,3 @@ jobs:
         run: bin/sbt clean compile test package makePom -DsparkVersion=3.5.1
         env:
           MODERN_JAVA: true
-      - name: Build and package project on "legacy" Spark
-        run: bin/sbt clean compile package makePom
-        env:
-          MODERN_JAVA: true
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 31b1b24..7dd600b 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -21,13 +21,14 @@ jobs:
           extraKey: ${{ runner.os }}
       - uses: coursier/setup-action@v1
         with:
-          jvm: adoptium:1.17
+          jvm: adopt:1.8
       # uses sbt-github-packages, see build.sbt
-      - name: Publish with SBT
+      - name: Publish for Spark 2 with SBT
         run: bin/sbt publish
-        env:
-          MODERN_JAVA: true
-      - name: Publish with SBT
+      - uses: coursier/setup-action@v1
+        with:
+          jvm: adoptium:1.17
+      - name: Publish for Spark 3 with SBT
         run: bin/sbt publish -DsparkVersion=3.5.1
         env:
           MODERN_JAVA: true