Use coretto for JDK 8 plus add MacOS ARM

mdedetrich · May 8, 2024 · 152e9f8 · 152e9f8
1 parent 2a57287
commit 152e9f8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,21 +22,25 @@ 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)
         uses: actions/checkout@v4
         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,19 +100,19 @@ 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)
         uses: actions/checkout@v4
         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
@@ -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")