added qt6 config
This commit is contained in:
parent
365d09f108
commit
b37a812445
|
@ -48,6 +48,23 @@ jobs:
|
|||
qtdirvalue: "../Qt/5.15.2/msvc2019_64/lib/cmake/Qt5",
|
||||
},
|
||||
}
|
||||
- {
|
||||
name: "Windows 2019 MSVC Qt6",
|
||||
os: windows-2019,
|
||||
artifact: "windows_msvc.7z",
|
||||
build_type: "Release",
|
||||
cc: "cl",
|
||||
cxx: "cl",
|
||||
environment_script: "C:/Program Files/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
|
||||
archiver: "7z a",
|
||||
generators: "Visual Studio 16 2019",
|
||||
cmake:
|
||||
{
|
||||
qtversion: "6.2.4",
|
||||
qtdirkey: "Qt6_DIR",
|
||||
qtdirvalue: "../Qt/6.2.4/msvc2019_64/lib/cmake/Qt6",
|
||||
},
|
||||
}
|
||||
- {
|
||||
name: "Ubuntu_Latest_GCC Qt5",
|
||||
os: ubuntu-latest,
|
||||
|
@ -165,14 +182,24 @@ jobs:
|
|||
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
- name: Cache Qt
|
||||
- name: Cache Qt5
|
||||
if: endsWith(matrix.config.name, 'Qt5')
|
||||
id: cache-qt-5-15
|
||||
uses: actions/cache@v1 # not v2!
|
||||
with:
|
||||
path: ../Qt/5.15.2
|
||||
key: ${{ runner.os }}-QtCache-Qt5
|
||||
|
||||
- name: Install Qt
|
||||
- name: Cache Qt6
|
||||
if: endsWith(matrix.config.name, 'Qt6')
|
||||
id: cache-qt-6-2
|
||||
uses: actions/cache@v1 # not v2!
|
||||
with:
|
||||
path: ../Qt/6.2.4
|
||||
key: ${{ runner.os }}-QtCache-Qt6
|
||||
|
||||
- name: Install Qt5
|
||||
if: endsWith(matrix.config.name, 'Qt5')
|
||||
uses: jurplel/install-qt-action@v3
|
||||
with:
|
||||
version: "5.15.2"
|
||||
|
@ -185,6 +212,20 @@ jobs:
|
|||
set-env: "true"
|
||||
tools-only: "false"
|
||||
|
||||
- name: Install Qt6
|
||||
if: endsWith(matrix.config.name, 'Qt6')
|
||||
uses: jurplel/install-qt-action@v3
|
||||
with:
|
||||
version: "6.2.4"
|
||||
target: "desktop"
|
||||
install-deps: "true"
|
||||
modules: "qtwebengine"
|
||||
cached: ${{ steps.cache-qt-6-2.outputs.cache-hit }}
|
||||
setup-python: "false"
|
||||
tools: ""
|
||||
set-env: "true"
|
||||
tools-only: "false"
|
||||
|
||||
- name: Configure
|
||||
shell: bash
|
||||
run: |
|
||||
|
|
Loading…
Reference in New Issue