Skip to content

Commit

Permalink
Revert "CI: Exclude temurin@8/macos-latest and manually install sbt o…
Browse files Browse the repository at this point in the history
…n macOS"

This reverts commit 766e407.
  • Loading branch information
mkurz committed Jun 26, 2024
1 parent 0d764f4 commit afadcee
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 16 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,6 @@ jobs:
- name: Setup sbt
uses: sbt/setup-sbt@v1

- name: Install sbt
if: matrix.os == 'macos-latest'
shell: bash
run: brew install sbt

- name: Check that workflows are up to date
shell: bash
run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck
Expand Down
11 changes: 0 additions & 11 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,3 @@ ThisBuild / githubWorkflowJavaVersions := Seq(
)

ThisBuild / githubWorkflowBuildMatrixExclusions += MatrixExclude(Map("java" -> "temurin@8", "os" -> "macos-latest"))

// GitHub Actions macOS 13+ runner images do not come with sbt preinstalled anymore
ThisBuild / githubWorkflowBuildPreamble ++= Seq(
WorkflowStep.Run(
commands = List(
"brew install sbt"
),
cond = Some("matrix.os == 'macos-latest'"),
name = Some("Install sbt")
)
)

0 comments on commit afadcee

Please sign in to comment.