Merge branch 'windows-ci' into master

This commit is contained in:
scatterflower 2020-08-28 01:42:11 -05:00
commit 68fc2a44b3

View File

@ -12,8 +12,7 @@ on:
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
build-linux:
# The type of runner that the job will run on
runs-on: ubuntu-latest
@ -21,7 +20,7 @@ jobs:
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
# Runs a single command using the runners shell
- name: Install dependencies
run: sudo apt-get install qt5-default libqt5websockets5-dev g++ make
@ -36,5 +35,28 @@ jobs:
- name: Upload binary
uses: actions/upload-artifact@v2
with:
name: akashi
name: akashi-linux
path: bin/akashi
build-windows:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: ilammy/msvc-dev-cmd@v1
- name: Install Qt
uses: jurplel/install-qt-action@v2
- name: Build
run: |
cd $Env:GITHUB_WORKSPACE
qmake "CONFIG += qtquickcompiler" akashi.pro
nmake
windeployqt bin\akashi.exe --release --no-opengl-sw
- name: Upload zip
uses: actions/upload-artifact@v2
with:
name: akashi-windows
path: bin\