Merge pull request #2473 from tgodzik/remove-amcos-12

chore: Remove macOS-12 since it's scheduled for removal
scalacenter · Oct 21, 2024 · cd1c3d3 · cd1c3d3
2 parents ff36cd4 + 29d4981
commit cd1c3d3
Showing 1 changed file with 12 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macOS-12]
+        os: [ubuntu-latest, macOS-13]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -39,7 +39,8 @@ jobs:
           version: '22.3.0'
           java-version: '17'
           github-token: ${{ secrets.GITHUB_TOKEN }}
-
+      - uses: sbt/setup-sbt@v1
+      - uses: coursier/cache-action@v6
       - name: Tests
         run: sbt "sbtBloop/publishLocal; sbtBloop/scripted"
         shell: bash
@@ -50,14 +51,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macOS-12, macOS-14]
+        os: [ubuntu-latest, windows-latest, macOS-13, macOS-14]
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - uses: coursier/setup-action@v1
-        with:
-          apps: 'sbt'
+      - uses: sbt/setup-sbt@v1
       - uses: coursier/cache-action@v6
       - uses: graalvm/setup-graalvm@v1
         with:
@@ -83,7 +82,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macOS-12, macOS-14]
+        os: [ubuntu-latest, windows-latest, macOS-13, macOS-14]
         jdk: ["22.3.0", "17"]
 
     name: Test ${{ matrix.os }} -- ${{ matrix.jdk }}
@@ -99,22 +98,14 @@ jobs:
       - uses: coursier/setup-action@v1
         with:
           jvm: 'temurin:17'
-          apps: 'sbt'
         if: matrix.jdk == '17'
-
-      - uses: coursier/setup-action@v1
-        with:
-          apps: 'sbt'
-        if: matrix.os == 'macOS-14' && matrix.os == 'macOS-14'
-
-      - uses: coursier/cache-action@v6
-
       - uses: graalvm/setup-graalvm@v1
         with:
           version: ${{ matrix.jdk }}
           java-version: '17'
-        if: matrix.jdk == '22.3.0'
-
+        if: matrix.jdk == '22.3.0'    
+      - uses: coursier/cache-action@v6
+      - uses: sbt/setup-sbt@v1
       - uses: actions/setup-node@v4
         with:
           node-version: "16"
@@ -146,7 +137,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, macOS-12, macOS-14, windows-latest]
+        os: [ubuntu-20.04, macOS-13, macOS-14, windows-latest]
         include:
           - os: ubuntu-20.04
             artifact: bloop-linux
@@ -176,9 +167,7 @@ jobs:
           native-image-job-reports: 'true'
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: coursier/setup-action@v1
-        with:
-          apps: 'sbt'
+      - uses: sbt/setup-sbt@v1
 
       - name: Publish GraalVM Native artifacts
         run: sbt "cli/graalvm-native-image:packageBin"
@@ -235,6 +224,7 @@ jobs:
       - uses: coursier/setup-action@v1
         with:
           jvm: 'temurin:17'
+      - uses: sbt/setup-sbt@v1
       - uses: actions/setup-node@v4
         with:
           node-version: "16"