From 0c5b77c42e4703078dbf4e784ba2f38673e6f9a8 Mon Sep 17 00:00:00 2001 From: Georgi Krastev Date: Fri, 17 Mar 2023 12:08:50 +0100 Subject: [PATCH] Go back to Adopt JDK --- .github/workflows/ci.yml | 20 ++++++++++---------- build.sbt | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2d751e1bf..0583ed3d9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: @@ -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 @@ -78,7 +78,7 @@ 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) @@ -86,12 +86,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 diff --git a/build.sbt b/build.sbt index 9a9e70104..11520711d 100644 --- a/build.sbt +++ b/build.sbt @@ -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)