Skip to content

Commit

Permalink
Go back to Adopt JDK
Browse files Browse the repository at this point in the history
  • Loading branch information
joroKr21 committed Mar 17, 2023
1 parent d9866ed commit 0c5b77c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
matrix:
os: [ubuntu-latest]
scala: [2.12.17, 2.13.10]
java: [temurin@8]
java: [adopt-hotspot@1.8]
platform: [jvm, js, native]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -34,12 +34,12 @@ jobs:
with:
fetch-depth: 0

- name: Setup Java (temurin@8)
if: matrix.java == 'temurin@8'
- name: Setup Java (adopt-hotspot@1.8)
if: matrix.java == 'adopt-hotspot@1.8'
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 8
distribution: adopt-hotspot
java-version: 1.8

- name: Cache sbt
uses: actions/cache@v2
Expand Down Expand Up @@ -78,20 +78,20 @@ jobs:
matrix:
os: [ubuntu-latest]
scala: [2.13.10]
java: [temurin@8]
java: [adopt-hotspot@1.8]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Setup Java (temurin@8)
if: matrix.java == 'temurin@8'
- name: Setup Java (adopt-hotspot@1.8)
if: matrix.java == 'adopt-hotspot@1.8'
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 8
distribution: adopt-hotspot
java-version: 1.8

- name: Cache sbt
uses: actions/cache@v2
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ThisBuild / mimaFailOnNoPrevious := false
// GHA configuration

ThisBuild / githubWorkflowBuildPreamble := Seq(WorkflowStep.Run(List("sudo apt install clang libunwind-dev libgc-dev libre2-dev")))
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("8"))
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec(JavaSpec.Distribution.Adopt, "1.8"))
ThisBuild / githubWorkflowBuildMatrixAdditions += "platform" -> List("jvm", "js", "native")
ThisBuild / githubWorkflowArtifactUpload := false
ThisBuild / githubWorkflowBuildMatrixFailFast := Some(false)
Expand Down

0 comments on commit 0c5b77c

Please sign in to comment.