From 1283d7210b46a7c0ead855f24d77809a840d85ae Mon Sep 17 00:00:00 2001
From: kiwigitops <kiwisclubco@gmail.com>
Date: Wed, 20 May 2026 15:11:01 -0400
Subject: [PATCH] Guard build workflow JSON parsing

---
 .../CheckForUpdates.HelperFunctions.ps1                | 10 +++++-----
 Templates/AppSource App/.github/workflows/CICD.yaml    |  2 +-
 Templates/AppSource App/.github/workflows/Current.yaml |  2 +-
 .../AppSource App/.github/workflows/NextMajor.yaml     |  2 +-
 .../AppSource App/.github/workflows/NextMinor.yaml     |  2 +-
 .../.github/workflows/PullRequestHandler.yaml          |  2 +-
 .../Per Tenant Extension/.github/workflows/CICD.yaml   |  2 +-
 .../.github/workflows/Current.yaml                     |  2 +-
 .../.github/workflows/NextMajor.yaml                   |  2 +-
 .../.github/workflows/NextMinor.yaml                   |  2 +-
 .../.github/workflows/PullRequestHandler.yaml          |  2 +-
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Actions/CheckForUpdates/CheckForUpdates.HelperFunctions.ps1 b/Actions/CheckForUpdates/CheckForUpdates.HelperFunctions.ps1
index 3482ce5d0c..4269ef23b8 100644
--- a/Actions/CheckForUpdates/CheckForUpdates.HelperFunctions.ps1
+++ b/Actions/CheckForUpdates/CheckForUpdates.HelperFunctions.ps1
@@ -188,24 +188,24 @@ function ModifyBuildWorkflows {
             # First build job needs to have a dependency on the Initialization job only
             # Example (depth 1):
             #    needs: [ Initialization ]
-            #    if: (!failure()) && (!cancelled()) && fromJson(needs.Initialization.outputs.buildOrderJson)[0].projectsCount > 0
-            $if = "if: (!failure()) && (!cancelled()) && fromJson(needs.Initialization.outputs.buildOrderJson)[$index].projectsCount > 0"
+            #    if: (!failure()) && (!cancelled()) && needs.Initialization.outputs.buildOrderJson != '' && fromJson(needs.Initialization.outputs.buildOrderJson)[0].projectsCount > 0
+            $if = "if: (!failure()) && (!cancelled()) && needs.Initialization.outputs.buildOrderJson != '' && fromJson(needs.Initialization.outputs.buildOrderJson)[$index].projectsCount > 0"
         }
         else {
             # Subsequent build jobs needs to have a dependency on all previous build jobs
             # Example (depth 2):
             #    needs: [ Initialization, Build1 ]
-            #    if: (!failure()) && (!cancelled()) && (needs.Build1.result == 'success' || needs.Build1.result == 'skipped') && fromJson(needs.Initialization.outputs.buildOrderJson)[0].projectsCount > 0
+            #    if: (!failure()) && (!cancelled()) && (needs.Build1.result == 'success' || needs.Build1.result == 'skipped') && needs.Initialization.outputs.buildOrderJson != '' && fromJson(needs.Initialization.outputs.buildOrderJson)[1].projectsCount > 0
             # Another example (depth 3):
             #    needs: [ Initialization, Build2, Build1 ]
-            #    if: (!failure()) && (!cancelled()) && (needs.Build2.result == 'success' || needs.Build2.result == 'skipped') && (needs.Build1.result == 'success' || needs.Build1.result == 'skipped') && fromJson(needs.Initialization.outputs.buildOrderJson)[0].projectsCount > 0
+            #    if: (!failure()) && (!cancelled()) && (needs.Build2.result == 'success' || needs.Build2.result == 'skipped') && (needs.Build1.result == 'success' || needs.Build1.result == 'skipped') && needs.Initialization.outputs.buildOrderJson != '' && fromJson(needs.Initialization.outputs.buildOrderJson)[2].projectsCount > 0
             $newBuild += @('')
             $ifpart = ""
             $index..1 | ForEach-Object {
                 $needs += @("Build$_")
                 $ifpart += " && (needs.Build$_.result == 'success' || needs.Build$_.result == 'skipped')"
             }
-            $if = "if: (!failure()) && (!cancelled())$ifpart && fromJson(needs.Initialization.outputs.buildOrderJson)[$index].projectsCount > 0"
+            $if = "if: (!failure()) && (!cancelled())$ifpart && needs.Initialization.outputs.buildOrderJson != '' && fromJson(needs.Initialization.outputs.buildOrderJson)[$index].projectsCount > 0"
         }
 
         # Replace the if:, the needs: and the strategy/matrix/project: in the build job with the correct values
diff --git a/Templates/AppSource App/.github/workflows/CICD.yaml b/Templates/AppSource App/.github/workflows/CICD.yaml
index 51bf4ac7e1..659aa5072f 100644
--- a/Templates/AppSource App/.github/workflows/CICD.yaml	
+++ b/Templates/AppSource App/.github/workflows/CICD.yaml	
@@ -183,7 +183,7 @@ jobs:
 
   Build:
     needs: [ Initialization ]
-    if: (!failure()) && (!cancelled()) && fromJson(needs.Initialization.outputs.buildOrderJson)[0].projectsCount > 0
+    if: (!failure()) && (!cancelled()) && needs.Initialization.outputs.buildOrderJson != '' && fromJson(needs.Initialization.outputs.buildOrderJson)[0].projectsCount > 0
     strategy:
       matrix:
         include: ${{ fromJson(needs.Initialization.outputs.buildOrderJson)[0].buildDimensions }}
diff --git a/Templates/AppSource App/.github/workflows/Current.yaml b/Templates/AppSource App/.github/workflows/Current.yaml
index 52bd63f4b0..0f6d970831 100644
--- a/Templates/AppSource App/.github/workflows/Current.yaml	
+++ b/Templates/AppSource App/.github/workflows/Current.yaml	
@@ -85,7 +85,7 @@ jobs:
 
   Build:
     needs: [ Initialization ]
-    if: (!failure()) && (!cancelled()) && fromJson(needs.Initialization.outputs.buildOrderJson)[0].projectsCount > 0
+    if: (!failure()) && (!cancelled()) && needs.Initialization.outputs.buildOrderJson != '' && fromJson(needs.Initialization.outputs.buildOrderJson)[0].projectsCount > 0
     strategy:
       matrix:
         include: ${{ fromJson(needs.Initialization.outputs.buildOrderJson)[0].buildDimensions }}
diff --git a/Templates/AppSource App/.github/workflows/NextMajor.yaml b/Templates/AppSource App/.github/workflows/NextMajor.yaml
index ac15217c7f..752a94f62b 100644
--- a/Templates/AppSource App/.github/workflows/NextMajor.yaml	
+++ b/Templates/AppSource App/.github/workflows/NextMajor.yaml	
@@ -85,7 +85,7 @@ jobs:
 
   Build:
     needs: [ Initialization ]
-    if: (!failure()) && (!cancelled()) && fromJson(needs.Initialization.outputs.buildOrderJson)[0].projectsCount > 0
+    if: (!failure()) && (!cancelled()) && needs.Initialization.outputs.buildOrderJson != '' && fromJson(needs.Initialization.outputs.buildOrderJson)[0].projectsCount > 0
     strategy:
       matrix:
         include: ${{ fromJson(needs.Initialization.outputs.buildOrderJson)[0].buildDimensions }}
diff --git a/Templates/AppSource App/.github/workflows/NextMinor.yaml b/Templates/AppSource App/.github/workflows/NextMinor.yaml
index eb6f3164f3..9a172b1606 100644
--- a/Templates/AppSource App/.github/workflows/NextMinor.yaml	
+++ b/Templates/AppSource App/.github/workflows/NextMinor.yaml	
@@ -85,7 +85,7 @@ jobs:
 
   Build:
     needs: [ Initialization ]
-    if: (!failure()) && (!cancelled()) && fromJson(needs.Initialization.outputs.buildOrderJson)[0].projectsCount > 0
+    if: (!failure()) && (!cancelled()) && needs.Initialization.outputs.buildOrderJson != '' && fromJson(needs.Initialization.outputs.buildOrderJson)[0].projectsCount > 0
     strategy:
       matrix:
         include: ${{ fromJson(needs.Initialization.outputs.buildOrderJson)[0].buildDimensions }}
diff --git a/Templates/AppSource App/.github/workflows/PullRequestHandler.yaml b/Templates/AppSource App/.github/workflows/PullRequestHandler.yaml
index 06b2638c24..cb040751ef 100644
--- a/Templates/AppSource App/.github/workflows/PullRequestHandler.yaml	
+++ b/Templates/AppSource App/.github/workflows/PullRequestHandler.yaml	
@@ -93,7 +93,7 @@ jobs:
 
   Build:
     needs: [ Initialization ]
-    if: (!failure()) && (!cancelled()) && fromJson(needs.Initialization.outputs.buildOrderJson)[0].projectsCount > 0
+    if: (!failure()) && (!cancelled()) && needs.Initialization.outputs.buildOrderJson != '' && fromJson(needs.Initialization.outputs.buildOrderJson)[0].projectsCount > 0
     strategy:
       matrix:
         include: ${{ fromJson(needs.Initialization.outputs.buildOrderJson)[0].buildDimensions }}
diff --git a/Templates/Per Tenant Extension/.github/workflows/CICD.yaml b/Templates/Per Tenant Extension/.github/workflows/CICD.yaml
index 456b4613c3..3eef9ae66a 100644
--- a/Templates/Per Tenant Extension/.github/workflows/CICD.yaml	
+++ b/Templates/Per Tenant Extension/.github/workflows/CICD.yaml	
@@ -183,7 +183,7 @@ jobs:
 
   Build:
     needs: [ Initialization ]
-    if: (!failure()) && (!cancelled()) && fromJson(needs.Initialization.outputs.buildOrderJson)[0].projectsCount > 0
+    if: (!failure()) && (!cancelled()) && needs.Initialization.outputs.buildOrderJson != '' && fromJson(needs.Initialization.outputs.buildOrderJson)[0].projectsCount > 0
     strategy:
       matrix:
         include: ${{ fromJson(needs.Initialization.outputs.buildOrderJson)[0].buildDimensions }}
diff --git a/Templates/Per Tenant Extension/.github/workflows/Current.yaml b/Templates/Per Tenant Extension/.github/workflows/Current.yaml
index 52bd63f4b0..0f6d970831 100644
--- a/Templates/Per Tenant Extension/.github/workflows/Current.yaml	
+++ b/Templates/Per Tenant Extension/.github/workflows/Current.yaml	
@@ -85,7 +85,7 @@ jobs:
 
   Build:
     needs: [ Initialization ]
-    if: (!failure()) && (!cancelled()) && fromJson(needs.Initialization.outputs.buildOrderJson)[0].projectsCount > 0
+    if: (!failure()) && (!cancelled()) && needs.Initialization.outputs.buildOrderJson != '' && fromJson(needs.Initialization.outputs.buildOrderJson)[0].projectsCount > 0
     strategy:
       matrix:
         include: ${{ fromJson(needs.Initialization.outputs.buildOrderJson)[0].buildDimensions }}
diff --git a/Templates/Per Tenant Extension/.github/workflows/NextMajor.yaml b/Templates/Per Tenant Extension/.github/workflows/NextMajor.yaml
index ac15217c7f..752a94f62b 100644
--- a/Templates/Per Tenant Extension/.github/workflows/NextMajor.yaml	
+++ b/Templates/Per Tenant Extension/.github/workflows/NextMajor.yaml	
@@ -85,7 +85,7 @@ jobs:
 
   Build:
     needs: [ Initialization ]
-    if: (!failure()) && (!cancelled()) && fromJson(needs.Initialization.outputs.buildOrderJson)[0].projectsCount > 0
+    if: (!failure()) && (!cancelled()) && needs.Initialization.outputs.buildOrderJson != '' && fromJson(needs.Initialization.outputs.buildOrderJson)[0].projectsCount > 0
     strategy:
       matrix:
         include: ${{ fromJson(needs.Initialization.outputs.buildOrderJson)[0].buildDimensions }}
diff --git a/Templates/Per Tenant Extension/.github/workflows/NextMinor.yaml b/Templates/Per Tenant Extension/.github/workflows/NextMinor.yaml
index eb6f3164f3..9a172b1606 100644
--- a/Templates/Per Tenant Extension/.github/workflows/NextMinor.yaml	
+++ b/Templates/Per Tenant Extension/.github/workflows/NextMinor.yaml	
@@ -85,7 +85,7 @@ jobs:
 
   Build:
     needs: [ Initialization ]
-    if: (!failure()) && (!cancelled()) && fromJson(needs.Initialization.outputs.buildOrderJson)[0].projectsCount > 0
+    if: (!failure()) && (!cancelled()) && needs.Initialization.outputs.buildOrderJson != '' && fromJson(needs.Initialization.outputs.buildOrderJson)[0].projectsCount > 0
     strategy:
       matrix:
         include: ${{ fromJson(needs.Initialization.outputs.buildOrderJson)[0].buildDimensions }}
diff --git a/Templates/Per Tenant Extension/.github/workflows/PullRequestHandler.yaml b/Templates/Per Tenant Extension/.github/workflows/PullRequestHandler.yaml
index 06b2638c24..cb040751ef 100644
--- a/Templates/Per Tenant Extension/.github/workflows/PullRequestHandler.yaml	
+++ b/Templates/Per Tenant Extension/.github/workflows/PullRequestHandler.yaml	
@@ -93,7 +93,7 @@ jobs:
 
   Build:
     needs: [ Initialization ]
-    if: (!failure()) && (!cancelled()) && fromJson(needs.Initialization.outputs.buildOrderJson)[0].projectsCount > 0
+    if: (!failure()) && (!cancelled()) && needs.Initialization.outputs.buildOrderJson != '' && fromJson(needs.Initialization.outputs.buildOrderJson)[0].projectsCount > 0
     strategy:
       matrix:
         include: ${{ fromJson(needs.Initialization.outputs.buildOrderJson)[0].buildDimensions }}