From 1888acec3b15e74f5a56865241e69569d9719cca Mon Sep 17 00:00:00 2001
From: Benson Rowley <148796244+rockyRaccoon13@users.noreply.github.com>
Date: Wed, 15 Apr 2026 10:26:58 -0600
Subject: [PATCH 1/2] Fix matrix strategy

---
 .github/workflows/webapp-deploy.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/webapp-deploy.yml b/.github/workflows/webapp-deploy.yml
index 5c687370..aa669aa9 100644
--- a/.github/workflows/webapp-deploy.yml
+++ b/.github/workflows/webapp-deploy.yml
@@ -258,14 +258,13 @@ jobs:
 
   package-deploy:
     if: |
-      always() &&
-      github.repository_owner == 'ni' && startsWith(github.ref, 'refs/heads/main') &&
-      !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled')
+
+      needs.generate-combined-matrix.outputs.is-empty != 'true'
     needs: [build-node, build-blazor, cache-slcli, generate-combined-matrix]
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        app_dir: ${{ fromJSON(needs.generate-node-matrix.outputs.matrix) }}
+        app_dir: ${{ fromJSON(needs.generate-combined-matrix.outputs.matrix) }}
     steps:
       - uses: actions/checkout@v6
 

From 5d4e51b97bc87dd35e67d269667f48e972c4acb8 Mon Sep 17 00:00:00 2001
From: Benson Rowley <148796244+rockyRaccoon13@users.noreply.github.com>
Date: Wed, 15 Apr 2026 10:33:32 -0600
Subject: [PATCH 2/2] fix webAppDeploy to run on main only

---
 .github/workflows/webapp-deploy.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/webapp-deploy.yml b/.github/workflows/webapp-deploy.yml
index aa669aa9..eb99899b 100644
--- a/.github/workflows/webapp-deploy.yml
+++ b/.github/workflows/webapp-deploy.yml
@@ -258,8 +258,9 @@ jobs:
 
   package-deploy:
     if: |
-
-      needs.generate-combined-matrix.outputs.is-empty != 'true'
+        github.repository_owner == 'ni' &&
+        startsWith(github.ref, 'refs/heads/main') &&
+        needs.generate-combined-matrix.outputs.is-empty != 'true'
     needs: [build-node, build-blazor, cache-slcli, generate-combined-matrix]
     runs-on: ubuntu-latest
     strategy: