[fix] ci: fix macos dmg

FastTrackOrg · Oct 22, 2024 · 4e77236 · 4e77236
1 parent 29b7606
commit 4e77236
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -99,7 +99,7 @@ jobs:
           path: src/build/FastTrack
 
   build_mac:
-    runs-on: macos-latest
+    runs-on: macos-15
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
@@ -141,7 +141,8 @@ jobs:
           macdeployqt FastTrack.app -always-overwrite
           wget https://raw.githubusercontent.com/tamlok/macdeployqtfix/master/macdeployqtfix.py
           cp *.qm FastTrack.app/Contents/Resources/
-          python macdeployqtfix.py FastTrack.app/Contents/MacOS/FastTrack ../../Qt/${{ env.QT_VERSION }}/
+          find / -name "libgcc_s.1.1.dylib" -exec cp {} FastTrack.app/Contents/Frameworks/ \; >/dev/null 2>&1 || true
+          python macdeployqtfix.py fasttrack.app/contents/macos/fasttrack ../../Qt/${{ env.QT_VERSION }}/
           hdiutil create -volname FastTrack -srcfolder FastTrack.app -ov -format UDZO FastTrack.dmg
       - name: upload_artefact
         uses: actions/upload-artifact@v4

diff --git a/src/FastTrack-Cli.pro b/src/FastTrack-Cli.pro
@@ -48,6 +48,7 @@ unix:macx {
   QT_CONFIG -= no-pkg-config
   CONFIG  += link_pkgconfig
   PKGCONFIG += opencv4
+  PKGCONFIG += protobuf
 
   ICON=assets/icon.icns
 }

diff --git a/src/FastTrack.pro b/src/FastTrack.pro
@@ -73,6 +73,7 @@ unix:macx {
   QT_CONFIG -= no-pkg-config
   CONFIG  += link_pkgconfig
   PKGCONFIG += opencv4
+  PKGCONFIG += protobuf
 
   ICON=assets/icon.icns
 }