Skip to content

Commit

Permalink
Update Java versions
Browse files Browse the repository at this point in the history
  • Loading branch information
rossabaker committed Jun 19, 2024
1 parent d491fab commit dd13392
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 7 deletions.
15 changes: 9 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ jobs:
matrix:
os: [ubuntu-latest, macos-latest]
scala: [2.12]
java: [temurin@8, temurin@17]
java: [temurin@8, temurin@21]
exclude:
- os: macos-latest
java: temurin@8
runs-on: ${{ matrix.os }}
timeout-minutes: 60
steps:
Expand All @@ -55,17 +58,17 @@ jobs:
if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
run: sbt +update

- name: Setup Java (temurin@17)
id: setup-java-temurin-17
if: matrix.java == 'temurin@17'
- name: Setup Java (temurin@21)
id: setup-java-temurin-21
if: matrix.java == 'temurin@21'
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
java-version: 21
cache: sbt

- name: sbt update
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.outputs.cache-hit == 'false'
run: sbt +update

- name: Check that workflows are up to date
Expand Down
7 changes: 6 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,14 @@ val MacOS = "macos-latest"
ThisBuild / githubWorkflowOSes := Seq(PrimaryOS, MacOS)

val PrimaryJava = JavaSpec.temurin("8")
val LTSJava = JavaSpec.temurin("17")
val LTSJava = JavaSpec.temurin("21")
ThisBuild / githubWorkflowJavaVersions := Seq(PrimaryJava, LTSJava)

// MacOS runners do not have temurin@8
ThisBuild / githubWorkflowBuildMatrixExclusions := Seq(
MatrixExclude(Map("os" -> MacOS, "java" -> JavaSpec.temurin("8").render))
)

// This build is for this Giter8 template.
// To test the template run `g8` or `g8Test` from the sbt session.
// See http://www.foundweekends.org/giter8/testing.html#Using+the+Giter8Plugin for more details.
Expand Down

0 comments on commit dd13392

Please sign in to comment.