Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.clang-format
View File

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

4
.github/workflows/main.yml vendored
View File

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