Skip to content

Commit 1ecbb5b

Browse files
authored
move CI to macos-latest (#212)
1 parent 030696e commit 1ecbb5b

File tree

2 files changed

+11
-20
lines changed

2 files changed

+11
-20
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
name: Build and Test
2323
strategy:
2424
matrix:
25-
os: [ubuntu-latest, macos-12]
25+
os: [ubuntu-latest, macos-latest]
2626
scala: [2.13.15]
2727
java:
28-
- temurin@8
28+
- zulu@8
2929
- temurin@11
3030
- temurin@17
3131
- temurin@21
@@ -37,11 +37,11 @@ jobs:
3737
with:
3838
fetch-depth: 0
3939

40-
- name: Setup Java (temurin@8)
41-
if: matrix.java == 'temurin@8'
40+
- name: Setup Java (zulu@8)
41+
if: matrix.java == 'zulu@8'
4242
uses: actions/setup-java@v4
4343
with:
44-
distribution: temurin
44+
distribution: zulu
4545
java-version: 8
4646
cache: sbt
4747

@@ -103,19 +103,19 @@ jobs:
103103
matrix:
104104
os: [ubuntu-latest]
105105
scala: [2.13.15]
106-
java: [temurin@8]
106+
java: [zulu@8]
107107
runs-on: ${{ matrix.os }}
108108
steps:
109109
- name: Checkout current branch (full)
110110
uses: actions/checkout@v4
111111
with:
112112
fetch-depth: 0
113113

114-
- name: Setup Java (temurin@8)
115-
if: matrix.java == 'temurin@8'
114+
- name: Setup Java (zulu@8)
115+
if: matrix.java == 'zulu@8'
116116
uses: actions/setup-java@v4
117117
with:
118-
distribution: temurin
118+
distribution: zulu
119119
java-version: 8
120120
cache: sbt
121121

build.sbt

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,9 @@ inThisBuild(Seq[Setting[_]](
1515
Developer("retronym", "Jason Zaugg", "@retronym", url("https://github.com/retronym")),
1616
),
1717
scalacOptions := Seq("-feature", "-deprecation", "-Xlint", "-Werror"),
18-
// since April 2024 or so, macos-latest gives us a machine that doesn't
19-
// have sbt installed (actions/setup-java#627). if we weren't using
20-
// sbt-github-actions it would be easy to just edit the workflow directly to
21-
// use `brew install sbt`, but it's easier to just stay on macos-12 for as
22-
// long as it remains available. I've reported the issue upstream at
23-
// sbt/sbt-github-actions#185 . if we do move
24-
// to macos-latest, note that it doesn't have temurin@8 anymore (as per
25-
// actions/setup-java#625), so we'd also need to change that entry (a few
26-
// lines below) from "temurin" to "zulu"
27-
githubWorkflowOSes := Seq("ubuntu-latest", "macos-12"),
18+
githubWorkflowOSes := Seq("ubuntu-latest", "macos-latest"),
2819
githubWorkflowJavaVersions := Seq(
29-
JavaSpec.temurin("8"),
20+
JavaSpec.zulu("8"), // macos-latest lacks Temurin 8
3021
JavaSpec.temurin("11"),
3122
JavaSpec.temurin("17"),
3223
JavaSpec.temurin("21"),

0 commit comments

Comments
 (0)