diff --git a/.github/actions/qt5-build/entrypoint.sh b/.github/actions/qt5-build/entrypoint.sh index 149fa528dca..e651013cda7 100755 --- a/.github/actions/qt5-build/entrypoint.sh +++ b/.github/actions/qt5-build/entrypoint.sh @@ -6,7 +6,7 @@ set -e set -x export CCACHE_DIR="$GITHUB_WORKSPACE/.ccache" -export PATH="$Qt5_Dir/bin:$PATH" +export PATH="$QT_ROOT_DIR/bin:$PATH" mkdir build && cd build cmake ../source/ \ diff --git a/.github/actions/qt6-build/entrypoint.sh b/.github/actions/qt6-build/entrypoint.sh index 8fef6a706a0..702bcc3f8f7 100755 --- a/.github/actions/qt6-build/entrypoint.sh +++ b/.github/actions/qt6-build/entrypoint.sh @@ -6,7 +6,7 @@ set -e set -x export CCACHE_DIR="$GITHUB_WORKSPACE/.ccache" -export PATH="$Qt6_DIR/bin:$PATH" +export PATH="$QT_ROOT_DIR/bin:$PATH" mkdir build && cd build qt-cmake ../source/ \ diff --git a/.github/workflows/qt-ci.yml b/.github/workflows/qt-ci.yml index 844f785ac54..dd504d9ab57 100644 --- a/.github/workflows/qt-ci.yml +++ b/.github/workflows/qt-ci.yml @@ -68,13 +68,13 @@ jobs: - name: Linux os: ubuntu-22.04 build_type: RelWithDebInfo - qt_version: 6.5.3 + qt_version: 6.7.0 qt_target: desktop compiler: "" - name: Linux_GCC13 os: ubuntu-24.04 build_type: RelWithDebInfo - qt_version: 6.5.3 + qt_version: 6.7.0 qt_target: desktop compiler: "gcc-13" - name: macOS @@ -88,19 +88,19 @@ jobs: - name: macOS os: macos-14 build_type: RelWithDebInfo - qt_version: 6.6.2 + qt_version: 6.7.0 qt_target: desktop deployment_target: 11.0 deployment_arch: "x86_64;arm64" compiler: "" - - name: macOS_LLVM17 + - name: macOS_LLVM18 os: macos-14 build_type: RelWithDebInfo - qt_version: 6.6.2 + qt_version: 6.7.0 qt_target: desktop deployment_target: 11.0 deployment_arch: "arm64" - compiler: "llvm@17" + compiler: "llvm" - name: win64_msvc2019 os: windows-2022 build_type: "RelWithDebInfo" @@ -115,7 +115,7 @@ jobs: build_type: "RelWithDebInfo" compiler_type: x64 compiler_version: 14.29 - qt_version: 6.5.3 + qt_version: 6.7.0 qt_target: desktop qt_arch: win64_msvc2019_64 qt_tools: ""