try build vs2019 and Qt5
This commit is contained in:
Rick Vogel
parent
02909e879f
commit
37b67d29a3
|
|
@ -2,9 +2,9 @@ name: CMake Build Matrix
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ cmake ]
|
branches: [cmake]
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: [ master ]
|
branches: [master]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
|
|
@ -13,69 +13,69 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
config:
|
config:
|
||||||
- {
|
- {
|
||||||
name: "Windows Latest MSVC",
|
name: "Windows Latest MSVC",
|
||||||
os: windows-latest,
|
os: windows-latest,
|
||||||
artifact: "windows_msvc.7z",
|
artifact: "windows_msvc.7z",
|
||||||
build_type: "Release",
|
build_type: "Release",
|
||||||
cc: "cl",
|
cc: "cl",
|
||||||
cxx: "cl",
|
cxx: "cl",
|
||||||
environment_script: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
|
environment_script: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
|
||||||
archiver: "7z a",
|
archiver: "7z a",
|
||||||
generators: "Visual Studio 17 2022"
|
generators: "Visual Studio 17 2022",
|
||||||
}
|
}
|
||||||
- {
|
- {
|
||||||
name: "Windows 2019 MSVC",
|
name: "Windows 2019 MSVC",
|
||||||
os: windows-2019,
|
os: windows-2019,
|
||||||
artifact: "windows_msvc.7z",
|
artifact: "windows_msvc.7z",
|
||||||
build_type: "Release",
|
build_type: "Release",
|
||||||
cc: "cl",
|
cc: "cl",
|
||||||
cxx: "cl",
|
cxx: "cl",
|
||||||
environment_script: "C:/Program Files/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
|
environment_script: "C:/Program Files/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
|
||||||
archiver: "7z a",
|
archiver: "7z a",
|
||||||
generators: "Visual Studio 16 2019"
|
generators: "Visual Studio 16 2019",
|
||||||
}
|
}
|
||||||
- {
|
- {
|
||||||
name: "Windows Latest MinGW",
|
name: "Windows Latest MinGW",
|
||||||
os: windows-latest,
|
os: windows-latest,
|
||||||
artifact: "windows_mingw.7z",
|
artifact: "windows_mingw.7z",
|
||||||
build_type: "Release",
|
build_type: "Release",
|
||||||
cc: "gcc",
|
cc: "gcc",
|
||||||
cxx: "g++",
|
cxx: "g++",
|
||||||
archiver: "7z a",
|
archiver: "7z a",
|
||||||
generators: "Ninja"
|
generators: "Ninja",
|
||||||
}
|
}
|
||||||
- {
|
- {
|
||||||
name: "Ubuntu_Latest_GCC",
|
name: "Ubuntu_Latest_GCC",
|
||||||
os: ubuntu-latest,
|
os: ubuntu-latest,
|
||||||
artifact: "ubuntu_gcc.7z",
|
artifact: "ubuntu_gcc.7z",
|
||||||
build_type: "Release",
|
build_type: "Release",
|
||||||
cc: "gcc",
|
cc: "gcc",
|
||||||
cxx: "g++",
|
cxx: "g++",
|
||||||
archiver: "7z a",
|
archiver: "7z a",
|
||||||
generators: "Ninja"
|
generators: "Ninja",
|
||||||
}
|
}
|
||||||
- {
|
- {
|
||||||
name: "Ubuntu_GCC_9",
|
name: "Ubuntu_GCC_9",
|
||||||
os: ubuntu-latest,
|
os: ubuntu-latest,
|
||||||
artifact: "ubuntu_gcc9.7z",
|
artifact: "ubuntu_gcc9.7z",
|
||||||
build_type: "Release",
|
build_type: "Release",
|
||||||
cc: "gcc",
|
cc: "gcc",
|
||||||
cxx: "g++",
|
cxx: "g++",
|
||||||
archiver: "7z a",
|
archiver: "7z a",
|
||||||
generators: "Ninja"
|
generators: "Ninja",
|
||||||
}
|
}
|
||||||
- {
|
- {
|
||||||
name: "macOS Latest Clang",
|
name: "macOS Latest Clang",
|
||||||
os: macos-latest,
|
os: macos-latest,
|
||||||
artifact: "macos_clang.7z",
|
artifact: "macos_clang.7z",
|
||||||
build_type: "Release",
|
build_type: "Release",
|
||||||
cc: "clang",
|
cc: "clang",
|
||||||
cxx: "clang++",
|
cxx: "clang++",
|
||||||
archiver: "7za a",
|
archiver: "7za a",
|
||||||
generators: "Ninja"
|
generators: "Ninja",
|
||||||
}
|
}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
|
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
|
||||||
|
|
@ -142,7 +142,30 @@ jobs:
|
||||||
brew install p7zip cmake ninja
|
brew install p7zip cmake ninja
|
||||||
ninja --version
|
ninja --version
|
||||||
cmake --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
|
- name: Configure
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
|
|
@ -153,7 +176,8 @@ jobs:
|
||||||
-B . \
|
-B . \
|
||||||
-DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} \
|
-DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} \
|
||||||
-G "${{ matrix.config.generators }}" \
|
-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
|
- name: Build
|
||||||
shell: bash
|
shell: bash
|
||||||
run: cmake --build . --config ${{ matrix.config.build_type }}
|
run: cmake --build . --config ${{ matrix.config.build_type }}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue