mirror of
https://github.com/Mahdi-zarei/nekoray.git
synced 2025-12-19 05:30:06 +08:00
Actions: Improve "Install Qt" job (#374)
* Actions: Define qt_arch in matrix * Update build.yml * Update main.cpp
This commit is contained in:
parent
cb87d0f07c
commit
9e1272984a
13
.github/workflows/build.yml
vendored
13
.github/workflows/build.yml
vendored
@ -75,6 +75,7 @@ jobs:
|
||||
- platform: windows-latest
|
||||
qt_version: "6.9.0"
|
||||
target: amd64
|
||||
qt_arch: win64_mingw
|
||||
- platform: ubuntu-22.04
|
||||
qt_version: "6.9.0"
|
||||
target: amd64
|
||||
@ -102,20 +103,10 @@ jobs:
|
||||
with:
|
||||
path: download-artifact
|
||||
# ========================================================================================================= Qt Install
|
||||
- name: Install Qt Windows
|
||||
uses: jurplel/install-qt-action@v4.1.1
|
||||
if: matrix.platform == 'windows-latest'
|
||||
with:
|
||||
arch: win64_mingw
|
||||
version: ${{ matrix.qt_version }}
|
||||
setup-python: true
|
||||
modules: qtcharts
|
||||
cache: true
|
||||
cache-key-prefix: QtCache-${{ matrix.platform }}-${{ matrix.target }}
|
||||
- name: Install Qt
|
||||
uses: jurplel/install-qt-action@v4.1.1
|
||||
if: matrix.platform != 'windows-latest'
|
||||
with:
|
||||
arch: ${{ matrix.qt_arch }}
|
||||
version: ${{ matrix.qt_version }}
|
||||
setup-python: true
|
||||
modules: qtcharts
|
||||
|
||||
@ -17,7 +17,6 @@
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
#include "include/sys/windows/MiniDump.h"
|
||||
#include "include/sys/windows/vcCheck.h"
|
||||
#include "include/sys/windows/eventHandler.h"
|
||||
#endif
|
||||
#ifdef Q_OS_LINUX
|
||||
|
||||
Loading…
Reference in New Issue
Block a user