Skip to content

Commit

Permalink
Add JDK21 and macos-latest to CI
Browse files Browse the repository at this point in the history
  • Loading branch information
mdedetrich committed Jan 23, 2024
1 parent 5fa73f5 commit 3df401e
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 3 deletions.
20 changes: 18 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ jobs:
name: Build and Test
strategy:
matrix:
os: [ubuntu-latest]
os: [ubuntu-latest, macos-latest]
scala: [2.12.18, 2.13.12, 3.3.1]
java: [temurin@8, temurin@11, temurin@17]
java: [temurin@8, temurin@11, temurin@17, temurin@21]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
Expand Down Expand Up @@ -56,6 +56,14 @@ jobs:
java-version: 17
cache: sbt

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

- name: Check that workflows are up to date
run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck

Expand Down Expand Up @@ -120,6 +128,14 @@ jobs:
java-version: 17
cache: sbt

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

- name: Download target directories (2.12.18)
uses: actions/download-artifact@v4
with:
Expand Down
5 changes: 4 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,11 @@ ThisBuild / githubWorkflowPublishTargetBranches :=
RefPredicate.Equals(Ref.Branch("main"))
)

ThisBuild / githubWorkflowOSes := Seq("ubuntu-latest", "macos-latest")

ThisBuild / githubWorkflowJavaVersions := List(
JavaSpec.temurin("8"),
JavaSpec.temurin("11"),
JavaSpec.temurin("17")
JavaSpec.temurin("17"),
JavaSpec.temurin("21")
)

0 comments on commit 3df401e

Please sign in to comment.