From 0a9974a254249ff1b0ae06765cd300e1b8ed05e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B5=AE=E7=94=9F=E8=8B=A5=E6=A2=A6?= <1070753498@qq.com> Date: Thu, 10 Oct 2024 09:39:54 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E8=84=9A=E6=9C=AC]:=20=E6=9B=B4=E6=96=B0=E4=BA=86GitH?= =?UTF-8?q?ub=20Actions=E7=9A=84=E4=BE=9D=E8=B5=96=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=EF=BC=8C=E4=BB=A5=E6=94=AF=E6=8C=81=E5=9C=A8?= =?UTF-8?q?=E4=B8=8D=E5=90=8C=E6=93=8D=E4=BD=9C=E7=B3=BB=E7=BB=9F=E4=B8=8A?= =?UTF-8?q?=E5=AE=89=E8=A3=85Qt=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在非Windows系统(macOS和Linux)上添加了条件判断,以安装Qt。 - 为Windows系统添加了特定的Qt安装步骤,指定了架构为`win64_msvc2022_64`。 --- .github/actions/install-dependencies/action.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/actions/install-dependencies/action.yml b/.github/actions/install-dependencies/action.yml index 93f2542..3cbd188 100644 --- a/.github/actions/install-dependencies/action.yml +++ b/.github/actions/install-dependencies/action.yml @@ -104,10 +104,20 @@ runs: ffmpeg[${{ inputs.vcpkg_ffmpeg_features }},amf,nvcodec] --triplet x64-linux \ || (cat /usr/local/share/vcpkg/installed/vcpkg/issue_body.md && exit 1) - - name: Install Qt + - name: Install Qt on non-windows + if: runner.os == 'macOS' || runner.os == 'Linux' + uses: jurplel/install-qt-action@v4 + with: + version: ${{ inputs.qt_ver }} + modules: ${{ inputs.qt_modules }} + cache: 'true' + + - name: Install Qt on windows + if: runner.os == 'Windows' uses: jurplel/install-qt-action@v4 with: version: ${{ inputs.qt_ver }} modules: ${{ inputs.qt_modules }} cache: 'true' + arch: 'win64_msvc2022_64' \ No newline at end of file