Skip to content

Commit

Permalink
Merge pull request #1880 from vasilmkd/java
Browse files Browse the repository at this point in the history
Use latest JDKs in CI
  • Loading branch information
vasilmkd authored May 5, 2021
2 parents a50fd1e + c2ca205 commit 35c9e1e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ jobs:
java:
- adopt@1.8
- adopt@1.11
- adopt@1.15
- adopt@1.16
- graalvm-ce-java8@21.0
ci: [ciJVM, ciJS, ciFirefox]
exclude:
- ci: ciJS
java: adopt@1.11
- ci: ciJS
java: adopt@1.15
java: adopt@1.16
- ci: ciJS
java: graalvm-ce-java8@21.0
- os: windows-latest
Expand All @@ -47,7 +47,7 @@ jobs:
- ci: ciFirefox
java: adopt@1.11
- ci: ciFirefox
java: adopt@1.15
java: adopt@1.16
- ci: ciFirefox
java: graalvm-ce-java8@21.0
- os: windows-latest
Expand All @@ -58,7 +58,7 @@ jobs:
scala: 2.12.13
- os: windows-latest
ci: ciFirefox
- java: adopt@1.15
- java: adopt@1.16
os: windows-latest
runs-on: ${{ matrix.os }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ ThisBuild / crossScalaVersions := Seq("3.0.0-RC2", "3.0.0-RC3", "2.12.13", Scala
ThisBuild / githubWorkflowTargetBranches := Seq("series/3.x")

val LTSJava = "adopt@1.11"
val LatestJava = "adopt@1.15"
val LatestJava = "adopt@1.16"
val GraalVM8 = "graalvm-ce-java8@21.0"

ThisBuild / githubWorkflowJavaVersions := Seq(ScalaJSJava, LTSJava, LatestJava, GraalVM8)
Expand Down

0 comments on commit 35c9e1e

Please sign in to comment.