diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 45fc1fd..aea7eb0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,9 +22,13 @@ jobs: name: Build and Test strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-13, macos-latest] scala: [2.12.19, 2.13.13, 3.3.3] - java: [temurin@8, temurin@11, temurin@17, temurin@21] + java: + - corretto@8 + - temurin@11 + - temurin@17 + - temurin@21 runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -32,11 +36,11 @@ jobs: with: fetch-depth: 0 - - name: Setup Java (temurin@8) - if: matrix.java == 'temurin@8' + - name: Setup Java (corretto@8) + if: matrix.java == 'corretto@8' uses: actions/setup-java@v4 with: - distribution: temurin + distribution: corretto java-version: 8 cache: sbt @@ -96,7 +100,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.13] - java: [temurin@8] + java: [corretto@8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -104,11 +108,11 @@ jobs: with: fetch-depth: 0 - - name: Setup Java (temurin@8) - if: matrix.java == 'temurin@8' + - name: Setup Java (corretto@8) + if: matrix.java == 'corretto@8' uses: actions/setup-java@v4 with: - distribution: temurin + distribution: corretto java-version: 8 cache: sbt diff --git a/build.sbt b/build.sbt index f3471cc..fa2a690 100644 --- a/build.sbt +++ b/build.sbt @@ -198,10 +198,10 @@ ThisBuild / githubWorkflowPublishTargetBranches := RefPredicate.Equals(Ref.Branch("main")) ) -ThisBuild / githubWorkflowOSes := Seq("ubuntu-latest", "macos-latest") +ThisBuild / githubWorkflowOSes := Seq("ubuntu-latest", "macos-13", "macos-latest") ThisBuild / githubWorkflowJavaVersions := List( - JavaSpec.temurin("8"), + JavaSpec.corretto("8"), JavaSpec.temurin("11"), JavaSpec.temurin("17"), JavaSpec.temurin("21")