Merge remote-tracking branch 'upstream/master220' into master220

NightDawnFox · Nov 11, 2024 · 34c39dc · 34c39dc
2 parents a69f0b5 + b31440c
commit 34c39dc
Show file tree

Hide file tree

Showing 268 changed files with 9,876 additions and 4,535 deletions.
diff --git a/.github/workflows/testmerge.yml b/.github/workflows/testmerge.yml
@@ -150,6 +150,15 @@ jobs:
             git commit -m "Automatic changelog generation"
           fi
 
+          # Generate TGUI bundle
+          ./tgui/bin/tgui
+          CHANGES=$(git diff --name-only --cached | wc -l)
+          if [ "$CHANGES" -gt 0 ] ; then
+            git config --local user.email "[email protected]"
+            git config --local user.name "TGUI bundle Generation"
+            git commit -m "Testmerge TGUI bundle build generation"
+          fi
+          
           git push -f origin ${{ env.TESTMERGE_BRANCH }}
 
           # Output the list of merged PRs