smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ci: adjust CI to use qt 6.10.1 with 6.9.3 being used for intel macs

Browse source
This commit is contained in:
sithlord48 2025-12-10 22:42:22 -05:00 committed by Chris Rizzitello
parent 8f972bf15e
commit 425d427fce
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/continuous-integration.yml vendored
View file

@ -88,6 +88,7 @@ jobs:
config-args: "-G Ninja" config-args: "-G Ninja"
vcpkg-triplet: x64-windows-release vcpkg-triplet: x64-windows-release
arch: "amd64" arch: "amd64"
qt-version: 6.10.1
- name: "windows-2022-arm64" - name: "windows-2022-arm64"
runs-on: "windows-11-arm" runs-on: "windows-11-arm"
@ -95,15 +96,18 @@ jobs:
config-args: "-G Ninja" config-args: "-G Ninja"
vcpkg-triplet: arm64-windows vcpkg-triplet: arm64-windows
arch: "arm64" arch: "arm64"
qt-version: 6.10.1
- name: "macos-arm64" - name: "macos-arm64"
runs-on: macos-15 runs-on: macos-15
timeout: 10 timeout: 10
qt-version: 6.10.1
config-args: '-DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET=14 -DCMAKE_OSX_SYSROOT=/Applications/Xcode_16.4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk' config-args: '-DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET=14 -DCMAKE_OSX_SYSROOT=/Applications/Xcode_16.4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk'
- name: "macos-x64" - name: "macos-x64"
runs-on: macos-15-intel runs-on: macos-15-intel
timeout: 20 timeout: 20
qt-version: 6.9.3
config-args: '-DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_OSX_DEPLOYMENT_TARGET=12 -DCMAKE_OSX_SYSROOT=/Applications/Xcode_16.4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk' config-args: '-DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_OSX_DEPLOYMENT_TARGET=12 -DCMAKE_OSX_SYSROOT=/Applications/Xcode_16.4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk'
- name: "debian-x86_64" - name: "debian-x86_64"
@ -246,7 +250,7 @@ jobs:
id: get-deps id: get-deps
uses: ./.github/actions/install-dependencies uses: ./.github/actions/install-dependencies
with: with:
qt-version: 6.10.0 qt-version: ${{matrix.target.qt-version}}
vcpkg-triplet: ${{matrix.target.vcpkg-triplet}} vcpkg-triplet: ${{matrix.target.vcpkg-triplet}}
like: ${{ matrix.target.like }} like: ${{ matrix.target.like }}

2
README.md
View file

@ -67,7 +67,7 @@ We support all major operating systems, including Windows, macOS, Linux, and Uni
Windows 10 v1809 or higher is required. Windows 10 v1809 or higher is required.
macOS 13 or higher is requried to use our CI builds for Apple Silicon machines. macOS 12 or higher is required for intel macs macOS 13 or higher is requried to use our CI builds for Apple Silicon machines. macOS 12 or higher is required for Intel macs or local builds.
Linux requires libei 1.3+ and libportal 0.8+ for the server/client. Additionally, Qt 6.7+ is required for the GUI. Linux requires libei 1.3+ and libportal 0.8+ for the server/client. Additionally, Qt 6.7+ is required for the GUI.
Linux users with systems not meeting these requirements should use flatpak in place of a native package. Linux users with systems not meeting these requirements should use flatpak in place of a native package.