Merge pull request #685 from satabin/scalafix-before-scalafmt

Run scalafix before scalafmt in `prePR`
typelevel · Mar 1, 2024 · 92a7588 · 92a7588
2 parents 28ca81e + ecff046
commit 92a7588
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/src/main/scala/org/typelevel/sbt/TypelevelPlugin.scala b/core/src/main/scala/org/typelevel/sbt/TypelevelPlugin.scala
@@ -84,8 +84,8 @@ object TypelevelPlugin extends AutoPlugin {
 
       val prePR = List("project /", "githubWorkflowGenerate") ++
         List("+headerCreateAll").filter(_ => header) ++
-        List("+scalafmtAll", "scalafmtSbt").filter(_ => scalafmt) ++
-        List("+scalafixAll").filter(_ => scalafix)
+        List("+scalafixAll").filter(_ => scalafix) ++
+        List("+scalafmtAll", "scalafmtSbt").filter(_ => scalafmt)
 
       val botHook = List("githubWorkflowGenerate") ++
         List("+headerCreateAll").filter(_ => header) ++