Only use CI build number when versionNameSuffix supplied (duckduckgo#1472)

CDRussell · web-flow · commit 530777c3078f · 2021-10-08T16:15:11.000+01:00
diff --git a/versioning.gradle b/versioning.gradle
@@ -33,10 +33,16 @@ ext {
     buildNumberCode = {
         filePath = "${CI_HOME_DIR}/build_number.properties"
         if(!new File(filePath).exists()) return 0
-        def props = new Properties()
-        props.load(new FileInputStream(filePath))
-        buildNumber = props["build"]
-        if (buildNumber == null) return 0 else return Integer.valueOf(buildNumber)
+
+        def suffix = getVersionNameSuffix()
+        if (suffix?.trim()) {
+            def props = new Properties()
+            props.load(new FileInputStream(filePath))
+            String buildNumber = props["build"]
+            if (buildNumber == null) return 0 else return Integer.valueOf(buildNumber)
+        } else {
+            return 0
+        }
     }
 }
 
