Return default values when no tag present

NordicSemiconductor · Feb 14, 2023 · b0340cd · b0340cd
1 parent 75b4e95
commit b0340cd
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/fastlane/report.xml b/fastlane/report.xml
@@ -5,12 +5,12 @@
 
 
 
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000156046">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000148473">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="1: publishToMavenLocal" time="7.550080403">
+      <testcase classname="fastlane.lanes" name="1: publishToMavenLocal" time="11.531691581">
 
       </testcase>
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -61,9 +61,9 @@ nordic-dfu = "2.3.0"
 nordic-log = "2.3.0"
 nordic-mcumgr = "1.5.2"
 nordic-scanner = "1.6.0"
-nordic-common = "1.4.2"
+nordic-common = "1.4.3"
 nordic-memfault = "1.0.2"
-nordicPlugins = "1.2.2"
+nordicPlugins = "1.3.0"
 googleServicesPlugins = "4.3.15"
 firebaseCrashlyticsPlugins = "4.5.1"
 

diff --git a/plugins/src/main/kotlin/no/nordicsemi/android/buildlogic/GitVersion.kt b/plugins/src/main/kotlin/no/nordicsemi/android/buildlogic/GitVersion.kt
@@ -36,15 +36,22 @@ import java.io.ByteArrayOutputStream
 import java.time.ZoneId
 import java.time.ZonedDateTime
 
+private const val DEFAULT_CODE = 0
+private const val DEFAULT_NAME = "0.0.0"
+
 /**
  * This method returns the version code based on the current date (YYMM) and number of git revisions.
  * The format is YYMMxxxxx where x is a number of git revisions.
  */
 fun Project.getVersionCodeFromTags(): Int {
     val code = ByteArrayOutputStream()
-    exec {
-        commandLine("git", "rev-list", "--all", "--count")
-        standardOutput = code
+    try {
+        exec {
+            commandLine("git", "rev-list", "--all", "--count")
+            standardOutput = code
+        }
+    } catch (e: Exception) {
+        return DEFAULT_CODE
     }
     val now = ZonedDateTime.now(ZoneId.of("UTC"))
     val year = now.year % 100
@@ -58,9 +65,13 @@ fun Project.getVersionCodeFromTags(): Int {
  */
 fun Project.getVersionNameFromTags(): String {
     val code = ByteArrayOutputStream()
-    exec {
-        commandLine("git", "describe", "--tags", "--abbrev=0")
-        standardOutput = code
+    try {
+        exec {
+            commandLine("git", "describe", "--tags", "--abbrev=0")
+            standardOutput = code
+        }
+    } catch (e: Exception) {
+        return DEFAULT_NAME
     }
     return code.toString().trim().split("%")[0]
 }