[fix] ci: fix macos dmg

FastTrackOrg · Oct 24, 2024 · d2047fb · d2047fb
1 parent 29b7606
commit d2047fb
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 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-14
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
@@ -139,9 +139,15 @@ jobs:
           make
           cd build/
           macdeployqt FastTrack.app -always-overwrite
-          wget https://raw.githubusercontent.com/tamlok/macdeployqtfix/master/macdeployqtfix.py
+          wget https://raw.githubusercontent.com/arl/macdeployqtfix/refs/heads/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/ \; 2> >(tee /dev/stderr) || true
+          find / -name "libsharpyuv.0.dylib" -exec cp {} FastTrack.app/Contents/Frameworks/ \; 2> >(tee /dev/stderr) || true
+          find / -name "libjxl_cms.0.11.dylib" -exec cp {} FastTrack.app/Contents/Frameworks/ \; 2> >(tee /dev/stderr) || true
+          cp -v /opt/homebrew/Cellar/opencv/*/lib/lib*.dylib FastTrack.app/Contents/Frameworks/ || true # Should (and was) be automatically done by macdeployqt!
+          cp -v /opt/homebrew/opt/little-cms2/lib/lib*.dylib FastTrack.app/Contents/Frameworks/ || true # Should (and was) be automatically done by macdeployqt!
+          cp -v /opt/homebrew/opt/jpeg-xl/lib/lib*.dylib FastTrack.app/Contents/Frameworks/ || true # Should (and was) be automatically done by macdeployqt!
+          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/.github/workflows/build_cli.yml b/.github/workflows/build_cli.yml
@@ -92,7 +92,7 @@ jobs:
           path: src/build_cli/
 
   build_mac:
-      runs-on: macos-latest
+      runs-on: macos-14
       steps:
         - uses: actions/checkout@v2
         - uses: actions/setup-python@v2
@@ -132,7 +132,14 @@ jobs:
               make
               cd build_cli/
               macdeployqt FastTrack-cli.app -always-overwrite
-              wget https://raw.githubusercontent.com/tamlok/macdeployqtfix/master/macdeployqtfix.py
+              wget https://raw.githubusercontent.com/arl/macdeployqtfix/refs/heads/master/macdeployqtfix.py
+              find / -name "libgcc_s.1.1.dylib" -exec cp {} FastTrack-cli.app/Contents/Frameworks/ \; 2> >(tee /dev/stderr) || true
+              find / -name "libsharpyuv.0.dylib" -exec cp {} FastTrack-cli.app/Contents/Frameworks/ \; 2> >(tee /dev/stderr) || true
+              find / -name "libjxl_cms.0.11.dylib" -exec cp {} FastTrack-cli.app/Contents/Frameworks/ \; 2> >(tee /dev/stderr) || true
+              cp -v /opt/homebrew/Cellar/opencv/*/lib/lib*.dylib FastTrack-cli.app/Contents/Frameworks/ || true # Should (and was) be automatically done by macdeployqt!
+              cp -v /opt/homebrew/opt/little-cms2/lib/lib*.dylib FastTrack-cli.app/Contents/Frameworks/ || true # Should (and was) be automatically done by macdeployqt!
+              cp -v /opt/homebrew/opt/jpeg-xl/lib/lib*.dylib FastTrack-cli.app/Contents/Frameworks/ || true # Should (and was) be automatically done by macdeployqt!
+              cp /opt/homebrew/Cellar/opencv/*/lib/lib*.dylib FastTrack-cli.app/Contents/Frameworks/ || true # Should (and was) be automatically done by macdeployqt!
               python macdeployqtfix.py FastTrack-cli.app/Contents/MacOS/FastTrack-cli ../../Qt/${{ env.QT_VERSION }}/
               hdiutil create -volname FastTrack-cli -srcfolder FastTrack-cli.app -ov -format UDZO FastTrack-cli.dmg
         - name: upload_artefact

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
 }