Separate legacy and modern steps into separate jobs

target · Apr 10, 2024 · e6f029a · e6f029a
1 parent 7664368
commit e6f029a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -11,8 +11,8 @@ env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
-  build:
-    name: Build and Test
+  build-legacy:
+    name: Build and Test on legacy JDK and Spark
     runs-on: ubuntu-latest
     steps:
       - name: Checkout current branch (full)
@@ -25,6 +25,15 @@ jobs:
           jvm: adopt:1.8
       - name: Build, test, and package project on "legacy" Spark
         run: bin/sbt clean compile test package makePom
+  build-modern:
+    name: Build and Test on Modern JDK and Spark
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout current branch (full)
+        uses: actions/checkout@v4
+      - uses: coursier/cache-action@v6
+        with:
+          extraKey: ${{ runner.os }}
       - uses: coursier/setup-action@v1
         with:
           jvm: adoptium:1.17

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -10,7 +10,7 @@ env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
-  deploy:
+  deploy-legacy:
     name: Release
     runs-on: ubuntu-latest
     steps:
@@ -23,12 +23,21 @@ jobs:
         with:
           jvm: adopt:1.8
       # uses sbt-github-packages, see build.sbt
-      - name: Publish for Spark 2 with SBT
+      - name: Publish for Spark 2 / Scala 2.11 with SBT
         run: bin/sbt publish
+  deploy-modern:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout current branch (full)
+        uses: actions/checkout@v4
+      - uses: coursier/cache-action@v6
+        with:
+          extraKey: ${{ runner.os }}
       - uses: coursier/setup-action@v1
         with:
           jvm: adoptium:1.17
-      - name: Publish for Spark 3 with SBT
+      - name: Publish for Spark 3 / Scala 2.12 with SBT
         run: bin/sbt publish -DsparkVersion=3.5.1
         env:
           MODERN_JAVA: true