CI: modify build.yml

Author: KangLin

.github/workflows/build.yml

@@ -81,14 +81,16 @@ jobs:
           echo "[:us: Change log](https://github.com/KangLin/SerialPortAssistant/blob/${{env.SerialPortAssistant_VERSION}}/ChangeLog.md)" >> ${{github.workspace}}/Release.md
           echo "" >> ${{github.workspace}}/Release.md
           echo "File checksum:" >> ${{github.workspace}}/Release.md
+          echo "|File|Checksum(md5)|" >> ${{github.workspace}}/Release.md
+          echo "| :- |    :-       |" >> ${{github.workspace}}/Release.md
           cd ${{ env.artifact_path }}
           for file in *
           do
               echo "$file"
               if [ -f $file ]; then
                   if [ "${file##*.}" != "xml" ] && [ "${file##*.}" != "json" ]; then
                       md5sum $file > $file.md5sum
-                      cat $file.md5sum >> ${{github.workspace}}/Release.md
+                      awk '{print  "|", $2, "|", $1, "|"}' ${file}.md5sum >> ${{github.workspace}}/Release.md
                   fi
               else
                  rm -fr $file

.github/workflows/ubuntu.yml

@@ -16,7 +16,7 @@ jobs:
   build_ubuntu:
     strategy:
       matrix:
-        BUILD_TYPE: [Release]
+        BUILD_TYPE: [Release, Debug]
 
     # See: https://docs.github.com/zh/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners
     # See: https://github.com/actions/runner-images/
@@ -48,14 +48,14 @@ jobs:
 
       - name: Install apt packages
         run: |
-          sudo apt update
-          sudo apt upgrade
+          sudo apt update -y
+          sudo apt upgrade -y
           sudo apt install -y -q cmake build-essential xvfb xpra \
               libglu1-mesa-dev libpulse-mainloop-glib0 \
               cmake debhelper fakeroot \
               qt6-tools-dev qt6-tools-dev-tools qt6-base-dev qt6-base-dev-tools \
               qt6-l10n-tools qt6-translations-l10n qt6-scxml-dev \
-              qt6-webengine-dev qt6-webengine-dev-tools libqt6serialport6-dev \
+              libqt6serialport6-dev \
               libxkbcommon-dev libxkbcommon-x11-dev xorg-dev libx11-xcb-dev \
               libx11-dev libxfixes-dev \
               libcmark-dev cmark
@@ -76,10 +76,9 @@ jobs:
       - name: build SerialPortAssistant
         env:
           RabbitCommon_DIR: ${{env.SOURCE_DIR}}/RabbitCommon
-          PKG_CONFIG_PATH: ${{env.INSTALL_DIR}}/lib/pkgconfig
         run: |
           cd ${{github.workspace}}
-          ./build_debpackage.sh /usr/lib/`uname -a`-linux-gnu/cmake/Qt6
+          ./build_debpackage.sh
           cp ../serialportassistant_${{env.SerialPortAssistant_VERSION}}_amd64.deb serialportassistant_${{env.SerialPortAssistant_VERSION}}_amd64.deb
 
       - name: update configure file

CMakeLists.txt

@@ -51,6 +51,8 @@ if(Qt${QT_VERSION_MAJOR}_FOUND)
     ENDFOREACH()
 endif()
 get_filename_component(QT_INSTALL_DIR "${Qt${QT_VERSION_MAJOR}_DIR}/../../.." ABSOLUTE)
+message("QT_ROOT:${QT_ROOT}")
+message("Qt${QT_VERSION_MAJOR}_ROOT:${Qt${QT_VERSION_MAJOR}_ROOT}")
 message("Qt${QT_VERSION_MAJOR}_DIR:${Qt${QT_VERSION_MAJOR}_DIR}")
 message("QT_INSTALL_DIR:${QT_INSTALL_DIR}")
 message("QT_LIBRARIES:${QT_LIBRARIES}")

ChangeLog.md

@@ -1,3 +1,5 @@
+## Change log
+
 - Version: v0.5.28
   - Use [RabbitCommon v2.3.1](https://github.com/KangLin/RabbitCommon/releases/tag/v2.3.1)
 

ChangeLog_zh_CN.md

@@ -1,3 +1,5 @@
+## 修改日志
+
 - 版本: v0.5.28
   - 使用 [RabbitCommon v2.3.1](https://github.com/KangLin/RabbitCommon/releases/tag/v2.3.1)
 

build_debpackage.sh

@@ -1,12 +1,16 @@
 #!/bin/bash
 
+function help()
+{
+    echo "Usage: $0 QT_ROOT RabbitCommon_DIR"
+}
+
 if [ -n "$1" -a -z "$QT_ROOT" ]; then
 	QT_ROOT=$1
 fi
 
-if [ -z "$QT_ROOT" ]; then
-	echo "$0 QT_ROOT RabbitCommon_DIR"
-    exit -1
+if [ -n "$QT_ROOT" ]; then
+    export QT_ROOT=$QT_ROOT
 fi
 
 if [ -n "$2" -a -z "$RabbitCommon_DIR" ]; then
@@ -17,11 +21,10 @@ if [ -z "$RabbitCommon_DIR" ]; then
 	RabbitCommon_DIR=`pwd`/../RabbitCommon
 fi
 
-if [ ! -d "$RabbitCommon_DIR" ]; then
-	echo "$0 QT_ROOT RabbitCommon_DIR"
+if [ -d "$RabbitCommon_DIR" ]; then
+    export RabbitCommon_DIR=$RabbitCommon_DIR
 fi
 
-
 #fakeroot debian/rules binary
 
 # -p, --sign-command=sign-command
@@ -64,4 +67,3 @@ dpkg-buildpackage -us -uc -b -d
 #dpkg-buildpackage -us -uc 
 
 #dpkg-buildpackage
-

debian/control

@@ -6,7 +6,7 @@ Section: main
 Priority: optional
 Maintainer: Kang Lin <[email protected]>
 Build-Depends: cmake, debhelper (>=13~), debhelper-compat (=13), fakeroot,
- libssl-dev, libcmark-dev, rabbitcommon-dev (>=2.2.6),
+ libssl-dev, libcmark-dev, rabbitcommon-dev (>=2.3.2),
  qt6-tools-dev, qt6-tools-dev-tools, qt6-base-dev, qt6-base-dev-tools,
  qt6-l10n-tools, qt6-translations-l10n, qt6-scxml-dev, libqt6serialport6-dev
 Standards-Version: 4.6.2

debian/rules

@@ -17,17 +17,6 @@
 %:
 	dh $@
 
-ifdef WITH_CMARK_GFM
-    PARAS += WITH_CMARK_GFM=$(WITH_CMARK_GFM)
-    ifdef cmark-gfm_DIR
-        PARAS += cmark-gfm_DIR=$(cmark-gfm_DIR)
-    endif
-endif
-
-ifdef INSTALL_DIR
-    LIB_PARAS += $(INSTALL_DIR)/lib
-endif
-
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 BUILD_DIR = "build_$(DEB_HOST_MULTIARCH)"
 PACKAGE_DIR = "debian/serialportassistant"
@@ -56,8 +45,5 @@ override_dh_auto_install:
 		--component Application \
 		--prefix $(PACKAGE_DIR)/opt/SerialPortAssistant
 
-#override_dh_shlibdeps:
-#	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info -l`pwd`/$(BUILD_DIR)/lib:$(LIB_PARAS)
-
 override_dh_builddeb:
 	dh_builddeb --package=serialportassistant -P$(PACKAGE_DIR)