Merge pull request #2386 from dondonz/support-non-git-download-issue-2350

andimarek · web-flow · commit 2cea0afb4d01 · 2021-06-16T14:29:34.000+10:00
Fix issue building zip and gzip downloads
diff --git a/build.gradle b/build.gradle
@@ -14,11 +14,22 @@ plugins {
 
 
 def getDevelopmentVersion() {
-    def output = new StringBuilder()
-    def error = new StringBuilder()
+    def gitCheckOutput = new StringBuilder()
+    def gitCheckError = new StringBuilder()
+    def gitCheck = ["git", "rev-parse", "--is-inside-work-tree"].execute()
+    gitCheck.waitForProcessOutput(gitCheckOutput, gitCheckError)
+    def isGit = gitCheckOutput.toString().trim()
+    if (isGit != "true") {
+        def version = "0.0.0-" + new SimpleDateFormat('yyyy-MM-dd\'T\'HH-mm-ss').format(new Date()) + "-no-git"
+        println "created development version: $version"
+        return version
+    }
+
+    def gitHashOutput = new StringBuilder()
+    def gitHashError = new StringBuilder()
     def gitShortHash = ["git", "-C", projectDir.toString(), "rev-parse", "--short", "HEAD"].execute()
-    gitShortHash.waitForProcessOutput(output, error)
-    def gitHash = output.toString().trim()
+    gitShortHash.waitForProcessOutput(gitHashOutput, gitHashError)
+    def gitHash = gitHashOutput.toString().trim()
     if (gitHash.isEmpty()) {
         println "git hash is empty: error: ${error.toString()}"
         throw new IllegalStateException("git hash could not be determined")
