From 818fb41ea81bda03669fff86353cbdcd3a521de2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Kleinb=C3=B6lting?= Date: Mon, 4 Sep 2023 10:53:08 +0200 Subject: [PATCH] =?UTF-8?q?chore:=20Filter=20"HEAD"=20as=20branch=20name?= =?UTF-8?q?=20when=20building=20a=20release=20on=20a=20chec=E2=80=A6=20(#2?= =?UTF-8?q?817)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sbt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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