diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 62e0bef..71c4222 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -80,10 +80,8 @@ jobs: java-version: 21 cache: sbt - - name: Install sbt - if: matrix.os == 'macos-latest' - shell: bash - run: brew install sbt + - name: Setup sbt + uses: sbt/setup-sbt@v1 - name: Check that workflows are up to date shell: bash @@ -162,6 +160,9 @@ jobs: java-version: 21 cache: sbt + - name: Setup sbt + uses: sbt/setup-sbt@v1 + - name: Download target directories (2.12.19) uses: actions/download-artifact@v4 with: diff --git a/build.sbt b/build.sbt index bfeba7e..805288e 100644 --- a/build.sbt +++ b/build.sbt @@ -51,17 +51,6 @@ 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") - ) -) - name := "sbt-osgi" enablePlugins(SbtPlugin) libraryDependencies ++= Dependencies.sbtOsgi diff --git a/project/plugins.sbt b/project/plugins.sbt index 4b7c109..693a080 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") -addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.23.0") +addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.24.0")