From 7ba031d3810d28d70870abdf0db2370a7dea535d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Kotiuk?= Date: Wed, 23 Oct 2024 21:12:19 +0200 Subject: [PATCH] fix: QT6 Build for MinGW on Windows --- .github/workflows/main.yml | 4 ++-- .github/workflows/release.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ff234c4e2..d3c4688ed 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -146,7 +146,7 @@ jobs: toolset: 14.1 - name: Install Qt - uses: jurplel/install-qt-action@v3 + uses: jurplel/install-qt-action@v4 with: version: ${{ matrix.qt-version }} host: "windows" @@ -158,7 +158,7 @@ jobs: - name: Configure CMake run: cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -B "${{ github.workspace }}/build" ${{ matrix.cmake-args }} env: - CMAKE_PREFIX_PATH: ${{ env.Qt5_Dir }} + CMAKE_PREFIX_PATH: "${{ env.QT_ROOT_DIR }}/lib/cmake" WORKSPACE_DIR: ${{ github.workspace }} - name: Build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7601b2991..a9a1e9977 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -158,7 +158,7 @@ jobs: pacman --noconfirm -U mingw-w64-x86_64-SDL2-2.30.6-1-any.pkg.tar.zst - name: Install Qt - uses: jurplel/install-qt-action@v3 + uses: jurplel/install-qt-action@v4 with: version: "5.15.2" host: "windows" @@ -170,7 +170,7 @@ jobs: - name: Configure CMake run: cmake -DCMAKE_BUILD_TYPE=Release -DCHECK_FOR_UPDATES=ON -DANTIMICROX_PKG_VERSION="GitHub Windows Release" -B '${{ github.workspace }}'/build env: - CMAKE_PREFIX_PATH: ${{env.Qt5_Dir}} + CMAKE_PREFIX_PATH: "${{ env.QT_ROOT_DIR }}/lib/cmake" - name: Build Installer run: cmake --build '${{ github.workspace }}'/build --target package --parallel 8 @@ -178,7 +178,7 @@ jobs: - name: Configure CMake (portable) run: cmake -DCMAKE_BUILD_TYPE=Release -DCHECK_FOR_UPDATES=ON -DANTIMICROX_PKG_VERSION="GitHub Portable Windows Release" -DPORTABLE_WIN=ON -B '${{ github.workspace }}'/build env: - CMAKE_PREFIX_PATH: ${{env.Qt5_Dir}} + CMAKE_PREFIX_PATH: "${{ env.QT_ROOT_DIR }}/lib/cmake" - name: Build ZIP Package run: cmake --build '${{ github.workspace }}'/build --target package --parallel 8