fix: wrong tag name in release artifactory (#1289)

osfans · Apr 8, 2024 · 5684366 · 5684366
1 parent 3dd930c
commit 5684366
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/build-logic/convention/src/main/kotlin/Utils.kt b/build-logic/convention/src/main/kotlin/Utils.kt
@@ -70,7 +70,14 @@ val Project.buildGitRepo
 val Project.buildVersionName
     get() =
         envOrProp("BUILD_VERSION_NAME", "buildVersionName") {
-            runCmd("git describe --tags --long --always")
+            // 构建正式版时过滤掉 nightly 标签
+            val cmd =
+                if (builder.contains("nightly", ignoreCase = true)) {
+                    "git describe --tags --long --always --match 'nightly'"
+                } else {
+                    "git describe --tags --long --always --match 'v*'"
+                }
+            runCmd(cmd)
         }
 
 val Project.buildCommitHash