[feat] ci: update qt&opencv

FastTrackOrg · Aug 19, 2024 · d46e901 · d46e901
1 parent 0507faa
commit d46e901
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,9 +5,9 @@ on:
     branches: [master]
 
 env:
-  QT_VERSION: 6.5.2
-  OPENCV_VERSION: 4.8.0
-  OPENCV_VERSION_: 480
+  QT_VERSION: 6.7.2
+  OPENCV_VERSION: 4.10.0
+  OPENCV_VERSION_: 4100
 
 jobs:
   build_linux:
@@ -45,7 +45,7 @@ jobs:
           cp fasttrack appdir
           export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/gcc_64/lib/
           chmod +x deploy.AppImage
-          ./deploy.AppImage appdir/fasttrack -bundle-non-qt-libs -unsupported-allow-new-glibc -qmake=${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/gcc_64/bin/qmake6 -extra-plugins=platforms/,sqldrivers/ -exclude-libs=libgmodule-2.0.so
+          ./deploy.AppImage appdir/fasttrack -bundle-non-qt-libs -unsupported-allow-new-glibc -qmake=${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/gcc_64/bin/qmake6 -extra-plugins=platforms/,sqldrivers/ -exclude-libs=libgmodule-2.0.so,libmimerapi.so
           mkdir -p appdir/usr/share/fasttrack/
           cp *.qm appdir/usr/share/fasttrack
           wget -O tool.AppImage https://github.com/AppImage/AppImageKit/releases/download/13/appimagetool-x86_64.AppImage
@@ -125,7 +125,6 @@ jobs:
           brew upgrade -q -f
           brew install pkg-config
           brew install openssl
-          brew unlink unixodbc
           brew install libiodbc
           brew tap FastTrackOrg/fasttrack
           brew install --build-from-source FastTrackOrg/fasttrack/opencv

diff --git a/.github/workflows/build_cli.yml b/.github/workflows/build_cli.yml
@@ -5,9 +5,9 @@ on:
     branches: [master]
 
 env:
-  QT_VERSION: 6.5.2
-  OPENCV_VERSION: 4.8.0
-  OPENCV_VERSION_: 480
+  QT_VERSION: 6.7.2
+  OPENCV_VERSION: 4.10.0
+  OPENCV_VERSION_: 4100
 
 jobs:
   build_linux:
@@ -43,7 +43,7 @@ jobs:
               cp sh.fasttrack.fasttrackcli.desktop build_cli/
               cp src/assets/fasttrack.png build_cli/
               export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/gcc_64/lib/
-              ./deploy.AppImage build_cli/fasttrack-cli -appimage -no-translations -bundle-non-qt-libs -unsupported-allow-new-glibc -qmake=${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/gcc_64/bin/qmake6 -extra-plugins=platforms/,sqldrivers/ -exclude-libs=libgmodule-2.0.so
+              ./deploy.AppImage build_cli/fasttrack-cli -appimage -no-translations -bundle-non-qt-libs -unsupported-allow-new-glibc -qmake=${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/gcc_64/bin/qmake6 -extra-plugins=platforms/,sqldrivers/ -exclude-libs=libgmodule-2.0.so,libmimerapi.so
               mv FastTrack*.AppImage FastTrack-cli-x86_64.AppImage
         - name: upload_artefact
           uses: actions/upload-artifact@v2
@@ -118,7 +118,6 @@ jobs:
               brew upgrade -q -f
               brew install pkg-config
               brew install openssl
-              brew unlink unixodbc
               brew install libiodbc
               brew tap FastTrackOrg/fasttrack
               brew install --build-from-source FastTrackOrg/fasttrack/opencv