diff --git a/build.sbt b/build.sbt index 22675bd8bf..1cb15eb842 100644 --- a/build.sbt +++ b/build.sbt @@ -21,8 +21,11 @@ Global / scalaVersion := Dependencies.ScalaVersion Global / semanticdbEnabled := true Global / semanticdbVersion := scalafixSemanticdb.revision -val gitCommit = ("git rev-parse HEAD" !!).trim -val gitBranch = Option("git rev-parse --abbrev-ref HEAD" !!).map(_.trim).filter(_ != "main").map(_.replace('/', '-')) +val gitCommit = ("git rev-parse HEAD" !!).trim +val gitBranch = Option("git rev-parse --abbrev-ref HEAD" !!) + .map(_.trim) + .filter(b => b != "main" || b != "HEAD") + .map(_.replace('/', '-')) val gitVersion = ("git describe --tag --dirty --abbrev=7 --always " !!).trim + gitBranch.fold("")("-" + _) ThisBuild / version := gitVersion