Skip to content

Commit

Permalink
Merge branch 'Shotgun-flashlight' of https://github.com/lolybomb/Para…
Browse files Browse the repository at this point in the history
…diseEXP into Shotgun-flashlight
  • Loading branch information
lolybomb committed Nov 6, 2024
2 parents af29b95 + b5d4a8b commit eb0614b
Show file tree
Hide file tree
Showing 251 changed files with 9,009 additions and 4,103 deletions.
9 changes: 9 additions & 0 deletions .github/workflows/testmerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit eb0614b

Please sign in to comment.