[fix] ci: fix macos ci

FastTrackOrg · Nov 20, 2023 · b814a28 · b814a28
1 parent fbf5fbd
commit b814a28
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -135,9 +135,9 @@ jobs:
           make
           cd build/
           macdeployqt FastTrack.app -always-overwrite
-          wget https://raw.githubusercontent.com/arl/macdeployqtfix/master/macdeployqtfix.py
+          wget https://raw.githubusercontent.com/tamlok/macdeployqtfix/master/macdeployqtfix.py
           cp *.qm FastTrack.app/Contents/Resources/
-          python2.7 macdeployqtfix.py FastTrack.app/Contents/MacOS/FastTrack ../../Qt/${{ env.QT_VERSION }}/
+          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@v1

diff --git a/.github/workflows/build_cli.yml b/.github/workflows/build_cli.yml
@@ -128,8 +128,8 @@ jobs:
               make
               cd build_cli/
               macdeployqt FastTrack-cli.app -always-overwrite
-              wget https://raw.githubusercontent.com/arl/macdeployqtfix/master/macdeployqtfix.py
-              python2.7 macdeployqtfix.py FastTrack-cli.app/Contents/MacOS/FastTrack-cli ../../Qt/${{ env.QT_VERSION }}/
+              wget https://raw.githubusercontent.com/tamlok/macdeployqtfix/master/macdeployqtfix.py
+              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
           uses: actions/upload-artifact@v2

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -105,7 +105,8 @@ jobs:
           brew upgrade -q -f
           brew install pkg-config
           brew install libomp
-          brew install opencv
+          brew tap FastTrackOrg/fasttrack
+          brew install --build-from-source FastTrackOrg/fasttrack/opencv
           brew install googletest
           export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/
           python -m pip install --upgrade pip setuptools wheel