Partly Revert "CI: manually install sbt on macOS"

This partly reverts commit f9c9e4f.
sbt · Jun 26, 2024 · 1bc554d · 1bc554d
1 parent d15283d
commit 1bc554d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -59,11 +59,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

diff --git a/publish.sbt b/publish.sbt
@@ -61,16 +61,6 @@ inThisBuild(
     githubWorkflowJavaVersions := Seq(
       JavaSpec.temurin("8")
     ),
-    githubWorkflowBuildMatrixExclusions += MatrixExclude(Map("java" -> "temurin@8", "os" -> "macos-latest")),
-    // GitHub Actions macOS 13+ runner images do not come with sbt preinstalled anymore
-    githubWorkflowBuildPreamble ++= Seq(
-      WorkflowStep.Run(
-        commands = List(
-          "brew install sbt"
-        ),
-        cond = Some("matrix.os == 'macos-latest'"),
-        name = Some("Install sbt")
-      )
-    )
+    githubWorkflowBuildMatrixExclusions += MatrixExclude(Map("java" -> "temurin@8", "os" -> "macos-latest"))
   )
 )