diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d7eb6f5..a877129 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,10 +56,8 @@ jobs: java-version: 8 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 @@ -114,6 +112,9 @@ jobs: java-version: 8 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/project/plugins.sbt b/project/plugins.sbt index a00d997..90483ad 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,7 +5,7 @@ addSbtPlugin(("com.github.sbt" % "sbt-site-paradox" % "1.7.0").exclude( addSbtPlugin("com.github.sbt" % "sbt-ghpages" % "0.8.0") 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") libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value diff --git a/publish.sbt b/publish.sbt index a190070..f0e4200 100644 --- 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")) ) )