From 79dc5c3c962b0e1a99d251f2ebaf51b7e36248d4 Mon Sep 17 00:00:00 2001
From: uncor3 <contactuncor3@gmail.com>
Date: Tue, 28 Oct 2025 09:24:11 +0000
Subject: [PATCH] update workflow

---
 .github/workflows/build-macos.yml | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 96bc47b..9be9d9a 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -24,19 +24,17 @@ jobs:
           token: ${{ secrets.PAT }}
 
       - name: Install Qt
-        run: |
-          curl -L -O https://download.qt.io/official_releases/online_installers/qt-online-installer-mac-x64-online.dmg
-          hdiutil attach qt-online-installer-mac-x64-online.dmg
-          "/Volumes/Qt Online Installer/Qt Online Installer.app/Contents/MacOS/Qt Online Installer" --accept-licenses --default-answer --confirm-command install qt.qt6.672.clang_64 qt.qt6.672.addons.qtlocation.clang_64 qt.qt6.672.addons.qtmultimedia.clang_64 qt.qt6.672.addons.qtpositioning.clang_64 qt.qt6.672.addons.qtserialbus.clang_64
-          hdiutil detach "/Volumes/Qt Online Installer"
+        uses: jurplel/install-qt-action@v4
+        with:
+          version: ${{ env.QT_VERSION }}
+          modules: "qtmultimedia qtlocation qtpositioning qtserialport"
 
       - name: Update pkgconfig path
         run: |
-          ls "${Qt6_DIR}/lib/pkgconfig"
+          # ls "${QT_ROOT_DIR}/lib/pkgconfig"
 
-          # write KEY=VALUE lines to GITHUB_ENV (required format)
-          echo "PKG_CONFIG_PATH=${Qt6_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH:-}" >> "$GITHUB_ENV"
-          echo "CMAKE_PREFIX_PATH=${Qt6_DIR}/lib/cmake:${CMAKE_PREFIX_PATH:-}" >> "$GITHUB_ENV"
+          # echo "PKG_CONFIG_PATH=${QT_ROOT_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH:-}" >> "$GITHUB_ENV"
+          echo "CMAKE_PREFIX_PATH=${QT_ROOT_DIR}/lib/cmake:${CMAKE_PREFIX_PATH:-}" >> "$GITHUB_ENV"
 
       - name: Set up Go
         uses: actions/setup-go@v6
@@ -70,8 +68,12 @@ jobs:
           git clone https://github.com/lxqt/qtermwidget.git
           pushd qtermwidget
           mkdir build && cd build
-          cmake ..
-          sudo make install
+          cmake .. \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_INSTALL_PREFIX=/usr/local \
+            -DLXQT_BUILD_QT6=ON \
+            -DBUILD_TESTS=OFF
+          sudo make -j"$(sysctl -n hw.ncpu)" install
           popd
 
       - name: Build libimobiledevice suite (versioned tarballs)