cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-30 08:33:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
tgstation-server
2020-07-31 03:45:35 +00:00
parent 602fd9a98a 2af9df3890
commit 6741176c2d
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci-suite.yml
+6 -11
View File
@@ -76,18 +76,10 @@ jobs:
- name: Patch Doxyfile
run: |
VERSION=$(cat "build/Version.props" | grep -oPm1 "(?<=<TgsCoreVersion>)[^<]+")
echo -e "\nPROJECT_NUMBER = $VERSION\nINPUT = .\nOUTPUT_DIRECTORY = $HOME/tgsdox\nPROJECT_LOGO = ./build/tgs.ico\nHAVE_DOT=YES" >> "docs/Doxyfile"
echo -e "\nPROJECT_NUMBER = $VERSION\nINPUT = .\nOUTPUT_DIRECTORY = $HOME/tgsdoxout\nPROJECT_LOGO = ./build/tgs.ico\nHAVE_DOT=YES" >> "docs/Doxyfile"
- name: Create DOXDIR
if: github.event_name != 'push' || github.event.ref != 'refs/heads/dev'
run: mkdir -p $HOME/tgsdox
- name: Prep gh-pages Repository
if: github.event_name == 'push' && github.event.ref == 'refs/heads/dev'
run: |
git clone -b gh-pages --single-branch "https://git@github.com/tgstation/tgstation-server" $HOME/tgsdox
cd $HOME/tgsdox
rm -r *
run: mkdir -p $HOME/tgsdoxout
- name: Doxygen Build
uses: mattnotmitt/doxygen-action@v1
@@ -97,7 +89,10 @@ jobs:
- name: gh-pages push
if: github.event_name == 'push' && github.event.ref == 'refs/heads/dev'
run: |
git clone -b gh-pages --single-branch "https://git@github.com/tgstation/tgstation-server" $HOME/tgsdox
cd $HOME/tgsdox
rm -r *
mv $HOME/tgsdoxout/* ./
git config --global push.default simple
git config user.name "tgstation-server"
git config user.email "tgstation-server@tgstation13.org"
@@ -679,7 +674,7 @@ jobs:
deploy-tgs:
name: Deploy TGS
needs: [deploy-dm, deploy-http, deploy-client]
needs: [upload-code-coverage, validate-openapi-spec]
runs-on: windows-latest
if: github.event_name == 'push' && github.event.ref == 'refs/heads/master' && contains(github.event.head_commit.message, '[TGSDeploy]')
steps: