diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index f46e366cb..f7fc9b020 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -88,6 +88,7 @@ jobs: config-args: "-G Ninja" vcpkg-triplet: x64-windows-release arch: "amd64" + qt-version: 6.10.1 - name: "windows-2022-arm64" runs-on: "windows-11-arm" @@ -95,15 +96,18 @@ jobs: config-args: "-G Ninja" vcpkg-triplet: arm64-windows arch: "arm64" + qt-version: 6.10.1 - name: "macos-arm64" runs-on: macos-15 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' - name: "macos-x64" runs-on: macos-15-intel 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' - name: "debian-x86_64" @@ -246,7 +250,7 @@ jobs: id: get-deps uses: ./.github/actions/install-dependencies with: - qt-version: 6.10.0 + qt-version: ${{matrix.target.qt-version}} vcpkg-triplet: ${{matrix.target.vcpkg-triplet}} like: ${{ matrix.target.like }} diff --git a/README.md b/README.md index 5f4d7bb10..c0210b496 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ We support all major operating systems, including Windows, macOS, Linux, and Uni 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 users with systems not meeting these requirements should use flatpak in place of a native package.