Skip to content

Commit

Permalink
Merge pull request #142 from scala-steward/update/sbt-github-actions-…
Browse files Browse the repository at this point in the history
…0.24.0

Update sbt-github-actions to 0.24.0
  • Loading branch information
mkurz authored Jun 26, 2024
2 parents 62f406f + 0e01fe6 commit eeb6468
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 16 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
11 changes: 0 additions & 11 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")

0 comments on commit eeb6468

Please sign in to comment.