CI: fix ubuntu.yml

KangLin · Jun 23, 2023 · ab30b31 · ab30b31
1 parent f26ec3c
commit ab30b31
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -91,6 +91,7 @@ jobs:
       - name: build_debpackage.sh
         working-directory: ${{github.workspace}}
         env:
+          ENABLE_DOWNLOAD_MODUEL: ON
           RabbitCommon_DIR: ${{env.SOURCE_DIR}}/RabbitCommon
           SeetaFace_DIR: ${{env.INSTALL_DIR}}/lib/cmake
           SeetaNet_DIR: ${{env.INSTALL_DIR}}/lib/cmake
@@ -100,11 +101,6 @@ jobs:
           SeetaFaceTracker_DIR: ${{env.INSTALL_DIR}}/lib/cmake
           SeetaQualityAssessor_DIR: ${{env.INSTALL_DIR}}/lib/cmake
         run: |
-          if [ ${{matrix.BUILD_TYPE}} == 'Release' ]; then
-              export BUILD_VIEWER_TERMINAL=OFF
-          else
-              export tigervnc_DIR=${{env.INSTALL_DIR}}/lib/cmake/tigervnc
-          fi
           ./build_debpackage.sh /usr/lib/`uname -m`-linux-gnu/qt5
           cp ../*.deb FaceRecognizer_${{env.FaceRecognizer_VERSION}}_amd64.deb
           md5sum FaceRecognizer_${{env.FaceRecognizer_VERSION}}_amd64.deb > FaceRecognizer_${{env.FaceRecognizer_VERSION}}_amd64.deb.md5sum

diff --git a/build_debpackage.sh b/build_debpackage.sh
@@ -2,7 +2,7 @@
 
 function help()
 {
-    echo "Useg: $0 QT_ROOT ThirdLibs_DIR RabbitCommon_DIR ENABLE_DOWNLOAD"
+    echo "Useg: $0 QT_ROOT ThirdLibs_DIR RabbitCommon_DIR ENABLE_DOWNLOAD_MODUEL"
     echo "Error message: $1"
     exit -1
 }
@@ -18,9 +18,7 @@ fi
 if [ -n "$2" ]; then
     export ThirdLibs_DIR=$2
 fi
-if [ ! -d "$ThirdLibs_DIR" ]; then
-    help "Directory don't exist: $ThirdLibs_DIR"
-fi
+
 if [ -n "${ThirdLibs_DIR}" ]; then
     export ThirdLibs_DIR=${ThirdLibs_DIR}
     export PKG_CONFIG_PATH=${ThirdLibs_DIR}/lib/pkgconfig
@@ -35,14 +33,14 @@ if [ -z "$RabbitCommon_DIR" ]; then
 fi
 
 if [ ! -d "$RabbitCommon_DIR" ]; then
-    help "Directory don't exist: $RabbitCommon_DIR"
+    help "RabbitCommon_DIR don't exist: $RabbitCommon_DIR"
 fi
 
 if [ -n "$4" ]; then
-    export ENABLE_DOWNLOAD=$4
+    export ENABLE_DOWNLOAD_MODUEL=$4
 fi
-if [ -z "$ENABLE_DOWNLOAD" ]; then
-    export ENABLE_DOWNLOAD=OFF
+if [ -z "$ENABLE_DOWNLOAD_MODUEL" ]; then
+    export ENABLE_DOWNLOAD_MODUEL=OFF
 fi
 
 export RabbitCommon_DIR=$RabbitCommon_DIR