From 5fa18219b673f2f4676a281ae632964582828bcb Mon Sep 17 00:00:00 2001 From: barry <870709867@qq.com> Date: Sat, 15 Feb 2025 16:01:23 +0800 Subject: [PATCH] fix: qt6 build error --- .github/workflows/macos.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index f5f101e..ab9965c 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -29,7 +29,7 @@ jobs: build-arch: x64 - qt-ver: 6.5.3 qt-arch-install: arm64 - build-arch: [x64, arm64] + build-arch: arm64 env: target-name: QtScrcpy qt-install-path: ${{ github.workspace }}/${{ matrix.qt-ver }} @@ -41,11 +41,19 @@ jobs: with: path: ${{ env.qt-install-path }}/${{ matrix.qt-arch-install }} key: ${{ runner.os }}/${{ matrix.qt-ver }}/${{ matrix.qt-arch-install }} - - name: Install Qt + - name: Install Qt5 + if: startsWith(matrix.qt-ver, '5.') uses: jurplel/install-qt-action@v4.1.1 with: version: ${{ matrix.qt-ver }} cached: ${{ steps.cache-qt.outputs.cache-hit }} + - name: Install Qt6 + if: startsWith(matrix.qt-ver, '6.') + uses: jurplel/install-qt-action@v4.1.1 + with: + version: ${{ matrix.qt-ver }} + modules: qtmultimedia + cached: ${{ steps.cache-qt.outputs.cache-hit }} - uses: actions/checkout@v2 with: fetch-depth: 0