Skip to content

Commit

Permalink
Revert ""brew install sbt" necessary with macos-latest now"
Browse files Browse the repository at this point in the history
This reverts commit 17b2b26.
  • Loading branch information
mkurz committed Jun 26, 2024
1 parent fb85a33 commit c403d49
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 16 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,6 @@ jobs:
- name: Setup sbt
uses: sbt/setup-sbt@v1

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

- name: Setup git
run: |
git config --global init.defaultBranch main
Expand Down
13 changes: 1 addition & 12 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -98,19 +98,8 @@ 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")
)
)

// Necessary to setup git so that sbt-scripted tests can run on github actions
ThisBuild / githubWorkflowBuildPreamble ++= Seq(
ThisBuild / githubWorkflowBuildPreamble := Seq(
WorkflowStep.Run(
commands = List(
"git config --global init.defaultBranch main",
Expand Down

0 comments on commit c403d49

Please sign in to comment.