Merge branch 'master' into dev

This commit is contained in:
tgstation-server
2020-07-31 03:11:20 +00:00
+1 -1
View File
@@ -76,7 +76,7 @@ jobs:
- name: Patch Doxyfile
run: |
VERSION=$(cat "build/Version.props" | grep -oPm1 "(?<=<TgsCoreVersion>)[^<]+")
echo -e "\nPROJECT_NUMBER = $VERSION\nINPUT = .\nOUTPUT_DIRECTORY = $DOXDIR\nPROJECT_LOGO = ./build/tgs.ico\nHAVE_DOT=YES" >> "docs/Doxyfile"
echo -e "\nPROJECT_NUMBER = $VERSION\nINPUT = .\nOUTPUT_DIRECTORY = $HOME/tgsdox\nPROJECT_LOGO = ./build/tgs.ico\nHAVE_DOT=YES" >> "docs/Doxyfile"
- name: Create DOXDIR
if: github.event_name != 'push' || github.event.ref != 'refs/heads/dev'