CI: Use qt6 in ubuntu.yml

KangLin · Aug 11, 2023 · 2b8c1b8 · 2b8c1b8
1 parent ca77a71
commit 2b8c1b8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -16,7 +16,7 @@ jobs:
       matrix:
         BUILD_TYPE: [Release, Debug]
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     env:
       BUILD_TYPE:  ${{matrix.BUILD_TYPE}}
@@ -55,9 +55,11 @@ jobs:
                 cmake build-essential \
                 debhelper fakeroot graphviz \
                 libglu1-mesa-dev libpulse-mainloop-glib0 \
-                qttools5-dev qttools5-dev-tools qtbase5-dev qtbase5-dev-tools \
-                qtmultimedia5-dev qtlocation5-dev libqt5svg5-dev \
-                qtwebengine5-dev libqtermwidget5-0-dev libqt5serialport5-dev\
+                qt6-tools-dev qt6-tools-dev-tools \
+                qt6-base-dev qt6-base-dev-tools qt6-qpa-plugins \
+                libqt6svg6-dev qt6-l10n-tools qt6-translations-l10n \
+                qt6-scxml-dev qt6-multimedia-dev libqt6serialport6-dev \
+                qt6-webengine-dev qt6-webengine-dev-tools \
                 libutf8proc-dev libpam0g-dev \
                 libxkbcommon-dev libxkbcommon-x11-dev xorg-dev libx11-xcb-dev \
                 libx11-dev libxfixes-dev \
@@ -117,7 +119,8 @@ jobs:
           SeetaQualityAssessor_DIR: ${{env.INSTALL_DIR}}/lib/cmake
           facedetection_DIR: ${{env.INSTALL_DIR}}/lib/cmake/facedetection
         run: |
-          ./build_debpackage.sh /usr/lib/`uname -m`-linux-gnu/qt5
+          export Qt6_DIR=/usr/lib/`uname-a`-linux-gnu/cmake/Qt6      
+          ./build_debpackage.sh
           cp ../facerecognizer_${{env.FaceRecognizer_VERSION}}_amd64.deb facerecognizer_${{env.FaceRecognizer_VERSION}}_amd64.deb
 
       - name: Update xml file

diff --git a/debian/rules b/debian/rules
@@ -58,7 +58,11 @@ endif
 # dh_make generated override targets
 # This is example for Cmake (See https://bugs.debian.org/641051 )
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/opt/FaceRecognizer -DQt5_DIR=${QT_ROOT}/lib/cmake/Qt5 -DRabbitCommon_DIR=${RabbitCommon_DIR} -DENABLE_DOWNLOAD_MODUEL=${ENABLE_DOWNLOAD_MODULE} ${PARAS}
+	dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX=/opt/FaceRecognizer \
+        -DRabbitCommon_DIR=${RabbitCommon_DIR} \
+        -DENABLE_DOWNLOAD_MODUEL=${ENABLE_DOWNLOAD_MODULE} \
+        ${PARAS}
 
 override_dh_auto_build:
 	dh_auto_build -- $(if "`cat /proc/cpuinfo |grep 'cpu cores' |wc -l`" = "0",, -j`cat /proc/cpuinfo |grep 'cpu cores' |wc -l`)