From afadceeeb08f8fcf5c628cacd39d9f0e8b67ee0d Mon Sep 17 00:00:00 2001
From: Matthias Kurz <m.kurz@irregular.at>
Date: Wed, 26 Jun 2024 14:29:46 +0200
Subject: [PATCH] Revert "CI: Exclude temurin@8/macos-latest and manually
 install sbt on macOS"

This reverts commit 766e4072c8beaed2334f21072a59ba68501bbbc6.
---
 .github/workflows/ci.yml |  5 -----
 build.sbt                | 11 -----------
 2 files changed, 16 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 81c9e83..71c4222 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -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
diff --git a/build.sbt b/build.sbt
index 551109b..3623a19 100644
--- a/build.sbt
+++ b/build.sbt
@@ -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")
-  )
-)