Merge pull request #813 from GitTools/bug/730

#730 - detect failed execution of gitversion before JSON.parse
GitTools · Mar 11, 2023 · 364926b · 364926b
2 parents a6b18fd + 6295c46
commit 364926b
Show file tree

Hide file tree

Showing 28 changed files with 91 additions and 56 deletions.
diff --git a/dist/azure/gitreleasemanager/addasset/bundle.js b/dist/azure/gitreleasemanager/addasset/bundle.js
diff --git a/dist/azure/gitreleasemanager/close/bundle.js b/dist/azure/gitreleasemanager/close/bundle.js
diff --git a/dist/azure/gitreleasemanager/create/bundle.js b/dist/azure/gitreleasemanager/create/bundle.js
diff --git a/dist/azure/gitreleasemanager/discard/bundle.js b/dist/azure/gitreleasemanager/discard/bundle.js
diff --git a/dist/azure/gitreleasemanager/open/bundle.js b/dist/azure/gitreleasemanager/open/bundle.js
diff --git a/dist/azure/gitreleasemanager/publish/bundle.js b/dist/azure/gitreleasemanager/publish/bundle.js
diff --git a/dist/azure/gitreleasemanager/setup/bundle.js b/dist/azure/gitreleasemanager/setup/bundle.js
diff --git a/dist/azure/gitversion/execute/bundle.js b/dist/azure/gitversion/execute/bundle.js
diff --git a/dist/azure/gitversion/setup/bundle.js b/dist/azure/gitversion/setup/bundle.js
diff --git a/dist/github/gitreleasemanager/addasset/bundle.js b/dist/github/gitreleasemanager/addasset/bundle.js
diff --git a/dist/github/gitreleasemanager/close/bundle.js b/dist/github/gitreleasemanager/close/bundle.js
diff --git a/dist/github/gitreleasemanager/create/bundle.js b/dist/github/gitreleasemanager/create/bundle.js
diff --git a/dist/github/gitreleasemanager/discard/bundle.js b/dist/github/gitreleasemanager/discard/bundle.js
diff --git a/dist/github/gitreleasemanager/open/bundle.js b/dist/github/gitreleasemanager/open/bundle.js
diff --git a/dist/github/gitreleasemanager/publish/bundle.js b/dist/github/gitreleasemanager/publish/bundle.js
diff --git a/dist/github/gitreleasemanager/setup/bundle.js b/dist/github/gitreleasemanager/setup/bundle.js
diff --git a/dist/github/gitversion/execute/bundle.js b/dist/github/gitversion/execute/bundle.js
diff --git a/dist/github/gitversion/setup/bundle.js b/dist/github/gitversion/setup/bundle.js
diff --git a/dist/mock/gitreleasemanager/addasset/bundle.js b/dist/mock/gitreleasemanager/addasset/bundle.js
diff --git a/dist/mock/gitreleasemanager/close/bundle.js b/dist/mock/gitreleasemanager/close/bundle.js
diff --git a/dist/mock/gitreleasemanager/create/bundle.js b/dist/mock/gitreleasemanager/create/bundle.js
diff --git a/dist/mock/gitreleasemanager/discard/bundle.js b/dist/mock/gitreleasemanager/discard/bundle.js
diff --git a/dist/mock/gitreleasemanager/open/bundle.js b/dist/mock/gitreleasemanager/open/bundle.js
diff --git a/dist/mock/gitreleasemanager/publish/bundle.js b/dist/mock/gitreleasemanager/publish/bundle.js
diff --git a/dist/mock/gitreleasemanager/setup/bundle.js b/dist/mock/gitreleasemanager/setup/bundle.js
diff --git a/dist/mock/gitversion/execute/bundle.js b/dist/mock/gitversion/execute/bundle.js
diff --git a/dist/mock/gitversion/setup/bundle.js b/dist/mock/gitversion/setup/bundle.js
diff --git a/src/tasks/gitversion/main.ts b/src/tasks/gitversion/main.ts
@@ -35,14 +35,19 @@ export async function run() {
         const settings: GitVersionSettings = settingsProvider.getGitVersionSettings()
 
         const result = await gitVersionTool.run(settings)
-        const { stdout } = result
-        const jsonOutput = stdout.substring(stdout.lastIndexOf('{'), stdout.lastIndexOf('}') + 1)
-
-        const gitversion = JSON.parse(jsonOutput) as GitVersionOutput
-        gitVersionTool.writeGitVersionToAgent(gitversion)
 
         if (result.code === 0) {
             buildAgent.setSucceeded('GitVersion executed successfully', true)
+            const { stdout } = result
+
+            if (stdout.lastIndexOf('{') === -1 || stdout.lastIndexOf('}') === -1) {
+                buildAgent.setFailed('GitVersion output is not valid JSON', true)
+            } else {
+                const jsonOutput = stdout.substring(stdout.lastIndexOf('{'), stdout.lastIndexOf('}') + 1)
+
+                const gitversion = JSON.parse(jsonOutput) as GitVersionOutput
+                gitVersionTool.writeGitVersionToAgent(gitversion)
+            }
         } else {
             buildAgent.setFailed(result.error.message, true)
         }