mirror of
https://github.com/Skycoder42/QHotkey.git
synced 2026-11-19 12:49:58 +03:00
Bump Qt and CI script versions, fix macOS support, and drop support for qmake (#98)
This commit is contained in:
@@ -14,10 +14,10 @@ jobs:
|
||||
build:
|
||||
strategy:
|
||||
matrix:
|
||||
qt_version: [5.12.11, 5.15.2, 6.2.0]
|
||||
qt_version: [5.12.12, 5.15.2, 6.2.2]
|
||||
platform: [ubuntu-20.04, windows-latest, macos-latest]
|
||||
include:
|
||||
- qt_version: 6.2.0
|
||||
- qt_version: 6.2.2
|
||||
additional_arguments: -D QT_DEFAULT_MAJOR_VERSION=6
|
||||
- platform: ubuntu-20.04
|
||||
make: make
|
||||
@@ -41,31 +41,16 @@ jobs:
|
||||
uses: actions/checkout@v2.3.4
|
||||
|
||||
- name: Install Qt
|
||||
uses: jurplel/install-qt-action@v2.14.0
|
||||
uses: jurplel/install-qt-action@v3.3.0
|
||||
with:
|
||||
version: ${{ matrix.qt_version }}
|
||||
|
||||
- name: Build with CMake as static
|
||||
run: |
|
||||
cmake . -D QHOTKEY_EXAMPLES=ON ${{ matrix.additional_arguments }}
|
||||
cmake . -D QHOTKEY_EXAMPLES=ON -D CMAKE_OSX_ARCHITECTURES="x86_64" ${{ matrix.additional_arguments }}
|
||||
cmake --build .
|
||||
|
||||
- name: Build with CMake as shared
|
||||
run: |
|
||||
cmake . -D BUILD_SHARED_LIBS=ON -D QHOTKEY_EXAMPLES=ON ${{ matrix.additional_arguments }}
|
||||
cmake . -D BUILD_SHARED_LIBS=ON -D QHOTKEY_EXAMPLES=ON -D CMAKE_OSX_ARCHITECTURES="x86_64" ${{ matrix.additional_arguments }}
|
||||
cmake --build .
|
||||
|
||||
- name: Setup MSVC environment for QMake
|
||||
uses: ilammy/msvc-dev-cmd@v1
|
||||
|
||||
- name: Build with QMake as static
|
||||
working-directory: HotkeyTest
|
||||
run: |
|
||||
qmake
|
||||
${{ matrix.make }}
|
||||
|
||||
- name: Build with QMake as shared
|
||||
working-directory: HotkeyTest
|
||||
run: |
|
||||
qmake "DEFINES+=QHOTKEY_SHARED QHOTKEY_LIBRARY"
|
||||
${{ matrix.make }}
|
||||
|
||||
Reference in New Issue
Block a user