From d9866ed2d5a27e029b971ebfddc2bb0ba9480726 Mon Sep 17 00:00:00 2001 From: Georgi Krastev Date: Thu, 2 Dec 2021 13:45:57 +0100 Subject: [PATCH] Set Java version to Temurin 8 --- .github/workflows/ci.yml | 20 ++++++++++++-------- build.sbt | 2 +- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0a3d5021c..2d751e1bf 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: [adopt@1.8] + java: [temurin@8] platform: [jvm, js, native] runs-on: ${{ matrix.os }} steps: @@ -34,10 +34,12 @@ jobs: with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v13 + - name: Setup Java (temurin@8) + if: matrix.java == 'temurin@8' + uses: actions/setup-java@v2 with: - java-version: ${{ matrix.java }} + distribution: temurin + java-version: 8 - name: Cache sbt uses: actions/cache@v2 @@ -76,7 +78,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.10] - java: [adopt@1.8] + java: [temurin@8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -84,10 +86,12 @@ jobs: with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v13 + - name: Setup Java (temurin@8) + if: matrix.java == 'temurin@8' + uses: actions/setup-java@v2 with: - java-version: ${{ matrix.java }} + distribution: temurin + java-version: 8 - name: Cache sbt uses: actions/cache@v2 diff --git a/build.sbt b/build.sbt index d0cc87e47..9a9e70104 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("adopt@1.8") +ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("8")) ThisBuild / githubWorkflowBuildMatrixAdditions += "platform" -> List("jvm", "js", "native") ThisBuild / githubWorkflowArtifactUpload := false ThisBuild / githubWorkflowBuildMatrixFailFast := Some(false)