From 015733b92ca5c0b3b87a1ef8fbbfc96a90bcd5a6 Mon Sep 17 00:00:00 2001 From: Salar Rahmanian Date: Fri, 29 Dec 2023 17:11:50 -0800 Subject: [PATCH] switch to corretto jdk for ci --- .github/workflows/ci.yml | 38 +++++++++++++++++++------------------- build.sbt | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index df9b0f5..c1ff66d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.12] - java: [temurin@21] + java: [corretto@21] project: [rootJVM] runs-on: ${{ matrix.os }} steps: @@ -38,21 +38,21 @@ jobs: with: fetch-depth: 0 - - name: Download Java (temurin@21) - id: download-java-temurin-21 - if: matrix.java == 'temurin@21' + - name: Download Java (corretto@21) + id: download-java-corretto-21 + if: matrix.java == 'corretto@21' uses: typelevel/download-java@v1 with: - distribution: temurin + distribution: corretto java-version: 21 - - name: Setup Java (temurin@21) - if: matrix.java == 'temurin@21' + - name: Setup Java (corretto@21) + if: matrix.java == 'corretto@21' uses: actions/setup-java@v2 with: distribution: jdkfile java-version: 21 - jdkFile: ${{ steps.download-java-temurin-21.outputs.jdkFile }} + jdkFile: ${{ steps.download-java-corretto-21.outputs.jdkFile }} - name: Cache sbt uses: actions/cache@v2 @@ -70,18 +70,18 @@ jobs: run: sbt githubWorkflowCheck - name: Check headers and formatting - if: matrix.java == 'temurin@21' + if: matrix.java == 'corretto@21' run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck - name: Test run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test - name: Check binary compatibility - if: matrix.java == 'temurin@21' + if: matrix.java == 'corretto@21' run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues - name: Generate API documentation - if: matrix.java == 'temurin@21' + if: matrix.java == 'corretto@21' run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc site: @@ -90,7 +90,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.12] - java: [temurin@21] + java: [corretto@21] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -98,21 +98,21 @@ jobs: with: fetch-depth: 0 - - name: Download Java (temurin@21) - id: download-java-temurin-21 - if: matrix.java == 'temurin@21' + - name: Download Java (corretto@21) + id: download-java-corretto-21 + if: matrix.java == 'corretto@21' uses: typelevel/download-java@v1 with: - distribution: temurin + distribution: corretto java-version: 21 - - name: Setup Java (temurin@21) - if: matrix.java == 'temurin@21' + - name: Setup Java (corretto@21) + if: matrix.java == 'corretto@21' uses: actions/setup-java@v2 with: distribution: jdkfile java-version: 21 - jdkFile: ${{ steps.download-java-temurin-21.outputs.jdkFile }} + jdkFile: ${{ steps.download-java-corretto-21.outputs.jdkFile }} - name: Cache sbt uses: actions/cache@v2 diff --git a/build.sbt b/build.sbt index 701d081..7989efa 100644 --- a/build.sbt +++ b/build.sbt @@ -23,7 +23,7 @@ ThisBuild / githubWorkflowPublishTargetBranches := Seq() // publish website from this branch ThisBuild / tlSitePublishBranch := Some("main") -ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("21")) +ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.corretto("21")) val Scala213 = "2.13.12" ThisBuild / crossScalaVersions := Seq(Scala213)