From 318016c56cc8208de3771453c2838d970b03eb0d Mon Sep 17 00:00:00 2001 From: Bruno Alexandre Rosa <1791393+brunoalr@users.noreply.github.com> Date: Wed, 24 Sep 2025 14:31:58 -0300 Subject: [PATCH] factor out common params --- .github/workflows/desktop-build.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index 5830a3e02..d956fdb90 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -229,6 +229,10 @@ jobs: strategy: fail-fast: false matrix: + # Common parameters for all macOS builds + qt_version: 6.6.* + qt_arch: clang_64 + qt_modules: "qtimageformats qtmultimedia qtwebsockets" include: - target: 13 soc: Intel @@ -236,8 +240,6 @@ jobs: xcode: "14.3.1" type: Release make_package: 1 - qt_version: 6.6.* - qt_modules: "qtimageformats qtmultimedia qtwebsockets" - target: 14 soc: Apple @@ -245,9 +247,6 @@ jobs: xcode: "15.4" type: Release make_package: 1 - qt_version: 6.6.* - qt_arch: clang_64 - qt_modules: "qtimageformats qtmultimedia qtwebsockets" - target: 15 soc: Apple @@ -255,18 +254,12 @@ jobs: xcode: "16.2" type: Release make_package: 1 - qt_version: 6.6.* - qt_arch: clang_64 - qt_modules: "qtimageformats qtmultimedia qtwebsockets" - target: 15 soc: Apple os: macos-15 xcode: "16.2" type: Debug - qt_version: 6.6.* - qt_arch: clang_64 - qt_modules: "qtimageformats qtmultimedia qtwebsockets" name: macOS ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} needs: configure @@ -298,7 +291,6 @@ jobs: setup-python: true version: ${{matrix.qt_version}} arch: ${{matrix.qt_arch}} - tools: ${{matrix.qt_tools}} modules: ${{matrix.qt_modules}} - name: Setup vcpkg cache