Merge branch 'master' of https://github.com/AttorneyOnline/akashi into master

This commit is contained in:
scatterflower 2020-10-05 15:57:52 -05:00
commit eb5f0120c6
2 changed files with 3 additions and 6 deletions

View File

@ -1,5 +0,0 @@
BasedOnStyle: LLVM
IndentWidth: 4
Language: Cpp
PointerAlignment: Left
BreakBeforeBraces: Stroustrup

View File

@ -27,12 +27,13 @@ jobs:
cd $GITHUB_WORKSPACE
qmake
make
mv bin/config_sample bin/config
- name: Upload binary
uses: actions/upload-artifact@v2
with:
name: akashi-linux
path: bin/akashi
path: bin/
build-windows:
runs-on: windows-latest
@ -50,6 +51,7 @@ jobs:
qmake "CONFIG += qtquickcompiler" akashi.pro
nmake
windeployqt bin\akashi.exe --release --no-opengl-sw
mv bin\config_sample bin\config
- name: Upload zip
uses: actions/upload-artifact@v2