try build vs2019 and Qt5
This commit is contained in:
parent
02909e879f
commit
37b67d29a3
|
@ -2,9 +2,9 @@ name: CMake Build Matrix
|
|||
|
||||
on:
|
||||
push:
|
||||
branches: [ cmake ]
|
||||
branches: [cmake]
|
||||
pull_request:
|
||||
branches: [ master ]
|
||||
branches: [master]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
|
@ -23,7 +23,7 @@ jobs:
|
|||
cxx: "cl",
|
||||
environment_script: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
|
||||
archiver: "7z a",
|
||||
generators: "Visual Studio 17 2022"
|
||||
generators: "Visual Studio 17 2022",
|
||||
}
|
||||
- {
|
||||
name: "Windows 2019 MSVC",
|
||||
|
@ -34,7 +34,7 @@ jobs:
|
|||
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"
|
||||
generators: "Visual Studio 16 2019",
|
||||
}
|
||||
- {
|
||||
name: "Windows Latest MinGW",
|
||||
|
@ -44,7 +44,7 @@ jobs:
|
|||
cc: "gcc",
|
||||
cxx: "g++",
|
||||
archiver: "7z a",
|
||||
generators: "Ninja"
|
||||
generators: "Ninja",
|
||||
}
|
||||
- {
|
||||
name: "Ubuntu_Latest_GCC",
|
||||
|
@ -54,7 +54,7 @@ jobs:
|
|||
cc: "gcc",
|
||||
cxx: "g++",
|
||||
archiver: "7z a",
|
||||
generators: "Ninja"
|
||||
generators: "Ninja",
|
||||
}
|
||||
- {
|
||||
name: "Ubuntu_GCC_9",
|
||||
|
@ -64,7 +64,7 @@ jobs:
|
|||
cc: "gcc",
|
||||
cxx: "g++",
|
||||
archiver: "7z a",
|
||||
generators: "Ninja"
|
||||
generators: "Ninja",
|
||||
}
|
||||
- {
|
||||
name: "macOS Latest Clang",
|
||||
|
@ -74,7 +74,7 @@ jobs:
|
|||
cc: "clang",
|
||||
cxx: "clang++",
|
||||
archiver: "7za a",
|
||||
generators: "Ninja"
|
||||
generators: "Ninja",
|
||||
}
|
||||
|
||||
steps:
|
||||
|
@ -143,6 +143,29 @@ jobs:
|
|||
ninja --version
|
||||
cmake --version
|
||||
|
||||
- uses: actions/checkout@v2
|
||||
- name: Cache Qt
|
||||
id: cache-qt-5-15
|
||||
uses: actions/cache@v1 # not v2!
|
||||
with:
|
||||
path: ../Qt/5.15.2 # TODO use absolute paths
|
||||
key: ${{ runner.os }}-QtCache-Qt5
|
||||
|
||||
- name: Install Qt
|
||||
uses: jurplel/install-qt-action@v2
|
||||
with:
|
||||
version: "5.15.2"
|
||||
#host: "windows"
|
||||
target: "desktop"
|
||||
#arch: "win64_msvc2019_64"
|
||||
install-deps: "true"
|
||||
modules: "qtwebengine"
|
||||
cached: ${{ steps.cache-qt-5-15.outputs.cache-hit }}
|
||||
setup-python: "false"
|
||||
tools: ""
|
||||
set-env: "true"
|
||||
tools-only: "false"
|
||||
|
||||
- name: Configure
|
||||
shell: bash
|
||||
run: |
|
||||
|
@ -153,7 +176,8 @@ jobs:
|
|||
-B . \
|
||||
-DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} \
|
||||
-G "${{ matrix.config.generators }}" \
|
||||
-DCMAKE_INSTALL_PREFIX:PATH=instdir
|
||||
-DCMAKE_INSTALL_PREFIX:PATH=instdir \
|
||||
-DQt5_DIR:PATH=../Qt/5.15.2/msvc2019_64/lib/cmake/Qt5
|
||||
- name: Build
|
||||
shell: bash
|
||||
run: cmake --build . --config ${{ matrix.config.build_type }}
|
||||
|
|
Loading…
Reference in New Issue