[ci] global: update to Qt 6.6.0

FastTrackOrg · Nov 17, 2023 · 10f42df · 10f42df
1 parent fbf5fbd
commit 10f42df
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,13 +5,13 @@ on:
     branches: [master]
 
 env:
-  QT_VERSION: 6.5.2
+  QT_VERSION: 6.6.0
   OPENCV_VERSION: 4.8.0
   OPENCV_VERSION_: 480
 
 jobs:
   build_linux:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
@@ -25,13 +25,13 @@ jobs:
             sudo apt-get install libxcb-*
             sudo apt-get install libxkb-*
             sudo apt-get install libavcodec-dev libavformat-dev libswscale-dev libnss3
-            sudo apt-get install libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev
+            sudo apt-get install libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev libunwind-dev libfuse2 libmysqlclient-dev
             sudo apt-get install libopencv-dev
       - name: install_qt6
         run: |
           pip install aqtinstall
-          python3 -m aqt install-qt -O ${{ github.workspace }}/Qt/ linux desktop ${{ env.QT_VERSION }}
-          echo ${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/gcc_64/bin/ >> $GITHUB_PATH
+          python3 -m aqt install-qt -O ${{ github.workspace }}/Qt/ linux desktop 6.5.2
+          echo ${{ github.workspace }}/Qt/6.5.2/gcc_64/bin/ >> $GITHUB_PATH
       - name: build_ft
         run: |
           ./run.sh ci
@@ -137,7 +137,7 @@ jobs:
           macdeployqt FastTrack.app -always-overwrite
           wget https://raw.githubusercontent.com/arl/macdeployqtfix/master/macdeployqtfix.py
           cp *.qm FastTrack.app/Contents/Resources/
-          python2.7 macdeployqtfix.py FastTrack.app/Contents/MacOS/FastTrack ../../Qt/${{ env.QT_VERSION }}/
+          #python2.7 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
@@ -5,13 +5,13 @@ on:
     branches: [master]
 
 env:
-  QT_VERSION: 6.5.2
+  QT_VERSION: 6.6.0
   OPENCV_VERSION: 4.8.0
   OPENCV_VERSION_: 480
 
 jobs:
   build_linux:
-      runs-on: ubuntu-20.04
+      runs-on: ubuntu-22.04
       steps:
         - uses: actions/checkout@v2
         - uses: actions/setup-python@v2
@@ -25,13 +25,13 @@ jobs:
               sudo apt-get install libxcb-*
               sudo apt-get install libxkb-*
               sudo apt-get install libavcodec-dev libavformat-dev libswscale-dev libnss3
-              sudo apt-get install libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev
+              sudo apt-get install libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev libunwind-dev libfuse2 libmysqlclient-dev
               sudo apt-get install libopencv-dev
         - name: install_qt6
           run: |
             pip install aqtinstall
-            python3 -m aqt install-qt -O ${{ github.workspace }}/Qt/ linux desktop ${{ env.QT_VERSION }}
-            echo ${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/gcc_64/bin/ >> $GITHUB_PATH
+            python3 -m aqt install-qt -O ${{ github.workspace }}/Qt/ linux desktop 6.5.2
+            echo ${{ github.workspace }}/Qt/6.5.2/gcc_64/bin/ >> $GITHUB_PATH
         - name: build_ftcli
           run: |
               ./run.sh cli
@@ -129,7 +129,7 @@ jobs:
               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 }}/
+              #python2.7 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
@@ -8,7 +8,7 @@ on:
     branches:
     - master
 env:
-  QT_VERSION: 6.5.2
+  QT_VERSION: 6.6.0
   OPENCV_VERSION: 4.8.0
 
 jobs:
@@ -88,7 +88,7 @@ jobs:
       - name: install_qt6
         run: |
           pip install aqtinstall
-          python3 -m aqt install-qt -m qtcharts -O ${{ github.workspace }}/Qt/ mac desktop ${{ env.QT_VERSION }}
+          python3 -m aqt install-qt -O ${{ github.workspace }}/Qt/ mac desktop ${{ env.QT_VERSION }}
           echo ${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/macos/bin/ >> $GITHUB_PATH
       - name: Set up Homebrew #https://github.com/Homebrew/homebrew-cask/issues/150323
         id: set-up-homebrew
@@ -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