server: improve testmerge worker 24

.github/workflows/testmerge.yml

@@ -151,15 +151,6 @@ jobs:
             git config --local user.name "Changelog Generation"
             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 }}
 

tgui/bin/tgui

@@ -136,7 +136,7 @@ task-merge-bundle() {
   echo "----------------------"
   echo "tgui: prepping to replace a conflicted bundle"
   cat $file_path > $file_current
-  task-rebuild-conflicted-bundle
+  task-rebuild-conflicted-bundle &
   exit 0
 }
 
@@ -145,6 +145,8 @@ task-rebuild-conflicted-bundle() {
   echo "tgui: rebuilding a conflicted tgui bundle, ${file_path}"
   task-install
   task-webpack --mode=production
+  echo "tgui: committing new bundle"
+  git commit -am "TGUI Bundle Rebuild"
   exit 0
 }