Update qt6-tripack.yml

Author: Sunnyl75

.github/workflows/qt6-tripack.yml

@@ -48,45 +48,54 @@ jobs:
             -DWITH_WEBSOCKET=ON -DWITH_QTKEYCHAIN=ON \
             -DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_HINT}" \
             -S ..
+
       - name: Build (Ubuntu)
         if: runner.os == 'Linux'
         run: cmake --build build --parallel
+
       - name: Package (Ubuntu)
         if: runner.os == 'Linux'
         run: cd build && cpack
+
       - name: Upload (Ubuntu)
         if: runner.os == 'Linux'
         uses: actions/upload-artifact@v4
         with:
           name: Mmapper-Token-Beta-Linux
           path: artifact/*
 
-            # ---------- macOS ----------
+      # ---------- macOS ----------
       - name: Install deps (macOS)
         if: runner.os == 'macOS'
         run: |
           brew update
           brew install cmake ninja qt qtkeychain openssl@3
-          # Export prefixes (used by CMake)
+          # Prefixes for CMake
           echo "QT_PREFIX=$(brew --prefix qt)" >> $GITHUB_ENV
           echo "QTKEYCHAIN_PREFIX=$(brew --prefix qtkeychain)" >> $GITHUB_ENV
           echo "OPENSSL_ROOT_DIR=$(brew --prefix openssl@3)" >> $GITHUB_ENV
+          # Ensure Qt tools are available to cmake/macdeployqt
+          echo "$(brew --prefix qt)/bin" >> $GITHUB_PATH
 
-          # Put our wrapper first on PATH, then Qt’s bin
+      - name: Patch macdeployqt wrapper (macOS)
+        if: runner.os == 'macOS'
+        shell: bash
+        run: |
+          set -e
           WRAP_DIR="$GITHUB_WORKSPACE/macwrap/bin"
           mkdir -p "$WRAP_DIR"
-          cat > "$WRAP_DIR/macdeployqt" <<'SH'
-#!/usr/bin/env bash
-set -e
-qtbin="$(brew --prefix qt)/bin"
-real="$qtbin/macdeployqt"
-lib_default="$(brew --prefix qt)/lib"
-# Always append a safe -libpath; if one was already provided, the last wins.
-exec "$real" "$@" -libpath "$lib_default"
-SH
+          # Write a small wrapper that ALWAYS appends a safe -libpath
+          printf '%s\n' \
+            '#!/usr/bin/env bash' \
+            'set -e' \
+            'qtbin="$(brew --prefix qt)/bin"' \
+            'real="$qtbin/macdeployqt"' \
+            'lib_default="$(brew --prefix qt)/lib"' \
+            'exec "$real" "$@" -libpath "$lib_default"' \
+            > "$WRAP_DIR/macdeployqt"
           chmod +x "$WRAP_DIR/macdeployqt"
-          echo "$WRAP_DIR" >> $GITHUB_PATH
-          echo "$(brew --prefix qt)/bin" >> $GITHUB_PATH
+          # Prepend our wrapper dir so it’s chosen before the real macdeployqt
+          echo "$WRAP_DIR" >> "$GITHUB_PATH"
 
       - name: Set package name (Intel)
         if: matrix.os == 'macos-13'
@@ -154,6 +163,7 @@ SH
       - name: MSVC env
         if: runner.os == 'Windows'
         uses: ilammy/msvc-dev-cmd@v1
+
       - name: Install Qt (Windows)
         if: runner.os == 'Windows'
         uses: jurplel/install-qt-action@v4
@@ -163,10 +173,12 @@ SH
           target: desktop
           arch: win64_msvc2019_64
           modules: 'qtwebsockets'
+
       - name: Set package name (Windows)
         if: runner.os == 'Windows'
         shell: bash
         run: echo "PACK_NAME=Mmapper-Token-Beta-Windows" >> $GITHUB_ENV
+
       - name: Configure (Windows)
         if: runner.os == 'Windows'
         shell: pwsh
@@ -182,14 +194,17 @@ SH
             -DWITH_WEBSOCKET=ON -DWITH_QTKEYCHAIN=ON `
             -DCMAKE_PREFIX_PATH="$env:QT_ROOT_DIR" `
             -S ..
+
       - name: Build (Windows)
         if: runner.os == 'Windows'
         shell: pwsh
         run: cmake --build build --parallel
+
       - name: Package (Windows)
         if: runner.os == 'Windows'
         shell: pwsh
         run: cd build; cpack
+
       - name: Upload (Windows)
         if: runner.os == 'Windows'
         uses: actions/upload-artifact@v4