From bf356eaadb5d40f3e00483329d441e1a06c8c7ac Mon Sep 17 00:00:00 2001
From: S34N <12197162+S34NW@users.noreply.github.com>
Date: Sun, 5 May 2024 17:07:46 +0100
Subject: [PATCH] Fix the workflows failing every comment (#25391)

* tgui rebuild

* fix this
---
 .github/workflows/merge_upstream_master.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/merge_upstream_master.yml b/.github/workflows/merge_upstream_master.yml
index 55417be56e4..9806851fa7c 100644
--- a/.github/workflows/merge_upstream_master.yml
+++ b/.github/workflows/merge_upstream_master.yml
@@ -110,12 +110,14 @@ jobs:
           git push origin
 
       - name: Rebuild TGUI
-        if: |
-          git diff-tree --name-only -r $(git rev-parse HEAD~2) | grep "tgui/public/"
         run: |
-          bash tgui/bin/tgui
-          git commit -m "Rebuild TGUI"
-          git push origin
+          if git diff-tree --name-only -r $(git rev-parse HEAD~2) | grep "tgui/public/"
+            bash tgui/bin/tgui
+            git commit -m "Rebuild TGUI"
+            git push origin
+          else
+            echo "No changes to rebuild TGUI"
+          fi
 
       - name: Notify Failure
         if: failure() && env.FAIL_NOTIFIED != 'true'