Try macdeployqtfix

Author: Koi-3088

SerialPrograms/azure-pipelines.yml

@@ -14,6 +14,11 @@ resources:
       name: PokemonAutomation/Packages
       endpoint: Koi-3088
       ref: refs/heads/master
+    - repository: macdeployqtfix
+      type: github
+      name: arl/macdeployqtfix
+      endpoint: Koi-3088
+      ref: refs/heads/master
 
 parameters:
   - name: buildType
@@ -335,6 +340,12 @@ jobs:
       persistCredentials: true
       clean: false
 
+    - checkout: macdeployqtfix
+      path: Arduino-Source/macdeployqtfix
+      submodules: recursive
+      persistCredentials: true
+      clean: false
+
     - script: |
         export PATH=$(macos_path)
         cd "$(Pipeline.Workspace)/Arduino-Source/SerialPrograms"
@@ -370,11 +381,32 @@ jobs:
 
         echo "=== Running Macdeployqt ==="
         install_name_tool -add_rpath $BREW_PREFIX/lib $MACOS_DIR/SerialPrograms
-        otool -l $APP_DIR | grep -A2 LC_RPATH
-        "$QT_BIN/macdeployqt" "$APP_DIR" -no-strip -verbose=3
+        otool -l $MACOS_DIR/SerialPrograms | grep -A2 LC_RPATH
+        "$QT_BIN/macdeployqt" $APP_DIR -no-strip -verbose=3
       displayName: 'Run macdeployqt'
       condition: succeeded()
 
+    - bash: |
+        set -e
+        echo "=== Running macdeployqtfix for MacOS $(architecture) ==="
+        export PATH=$(macos_path)
+        APP_DIR="$(Pipeline.Workspace)/Arduino-Source/build/$(cmake_preset)/SerialPrograms.app"
+        MACOS_DIR="$APP_DIR/Contents/MacOS"
+
+        if [ $(architecture) = "X64" ]; then
+            echo "Using Intel Homebrew and Qt..."
+            BREW_PREFIX=$(/usr/local/bin/brew --prefix)
+            QT_DIR="$BREW_PREFIX/opt/qt/"
+        else
+            echo "Using ARM64 Homebrew and Qt..."
+            BREW_PREFIX=$(/opt/homebrew/bin/brew --prefix)
+            QT_DIR="$BREW_PREFIX/opt/qt/"
+        fi
+
+        python3 "$(Pipeline.Workspace)/Arduino-Source/macdeployqtfix/macdeployqtfix.py" $MACOS_DIR/SerialPrograms $QT_DIR -v
+      displayName: 'Run macdeployqtfix'
+      condition: succeeded()
+
     - bash: |
         set -euo pipefail
         echo "=== Fixing the app bundle ==="