Merge pull request #687 from typelevel/update/sbt-typelevel-ci-releas…

…e-0.7.4 Update sbt-typelevel-ci-release, ... to 0.7.4
typelevel · Oct 11, 2024 · f76c6e4 · f76c6e4
2 parents 6655c70 + c9fa700
commit f76c6e4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,8 +35,7 @@ jobs:
     timeout-minutes: 60
     steps:
       - name: Install sbt
-        if: contains(runner.os, 'macos')
-        run: brew install sbt
+        uses: sbt/setup-sbt@v1
 
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
@@ -108,8 +107,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Install sbt
-        if: contains(runner.os, 'macos')
-        run: brew install sbt
+        uses: sbt/setup-sbt@v1
 
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
@@ -253,8 +251,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Install sbt
-        if: contains(runner.os, 'macos')
-        run: brew install sbt
+        uses: sbt/setup-sbt@v1
 
       - name: Checkout current branch (full)
         uses: actions/checkout@v4

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -3,6 +3,6 @@ addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.5")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
 addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2")
-addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.7.3")
-addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.3")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.7.4")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.4")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")