CI: modify docker.yml

Author: KangLin

.github/workflows/docker.yml

@@ -96,7 +96,7 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: true
           fetch-depth: 0
@@ -108,17 +108,30 @@ jobs:
           cmake -E make_directory ${{env.TOOLS_DIR}}
           cmake -E make_directory ${{env.INSTALL_DIR}}
 
+      - name: Cache installed
+        uses: actions/cache@v5
+        id: cache-installed
+        with:
+          path: |
+            ${{env.INSTALL_DIR}}
+            ${{env.TOOLS_DIR}}/linuxdeploy-*
+            ${{env.TOOLS_DIR}}/qt_*
+          key: install_docker_${{matrix.variant.PACKAGE}}_${{matrix.variant.image}}${{matrix.variant.lable}}_${{matrix.variant.os}}
+
       - name: run docker
         run: |
           if [ -n "${{matrix.variant.lable}}" ]; then
             docker_image="${{matrix.variant.image}}:${{matrix.variant.lable}}"
           else
             docker_image="${{matrix.variant.image}}"
           fi
-          ./Script/build_linux.sh --docker --docker-image="${docker_image}" --docker-platform="${{matrix.variant.platform}}" --${{matrix.variant.PACKAGE}}
+          ./Script/build_linux.sh --install=${{env.INSTALL_DIR}} \
+            --source=${{env.SOURCE_DIR}} \
+            --tools=${{env.TOOLS_DIR}} \
+            --docker-image="${docker_image}" --docker-platform="${{matrix.variant.platform}}" --${{matrix.variant.PACKAGE}}
           if [ "${{matrix.variant.PACKAGE}}" = "deb" ]; then
             echo "Copy deb package ......"
-            pushd ${{github.workspace}}/build_linux/
+            pushd ${{env.BUILD_DIR}}/build_linux/
             export ARCH=`dpkg --print-architecture`
             cp serialportassistant_*.deb serialportassistant_${{env.SerialPortAssistant_VERSION}}_${{matrix.variant.image}}_${{matrix.variant.lable}}_${ARCH}.deb
             popd
@@ -136,6 +149,6 @@ jobs:
         with:
           name: ${{ env.artifact_name }}_${{matrix.variant.PACKAGE}}_${{matrix.variant.image}}_${{matrix.variant.lable}}_${{matrix.variant.os}}
           path: |
-            ${{github.workspace}}/build_linux/serialportassistant*.rpm
-            ${{github.workspace}}/build_linux/serialportassistant*.deb
-            ${{github.workspace}}/build_linux/SerialPortAssistant_*.zip
+            ${{env.BUILD_DIR}}/build_linux/serialportassistant*.rpm
+            ${{env.BUILD_DIR}}/build_linux/serialportassistant*.deb
+            ${{env.BUILD_DIR}}/build_linux/SerialPortAssistant_*.zip

.github/workflows/ubuntu.yml

@@ -76,7 +76,7 @@ jobs:
         env:
           RabbitCommon_ROOT: ${{env.SOURCE_DIR}}/RabbitCommon
         run: |
-          ./Script/build_debpackage.sh
+          ./Script/build_debpackage.sh --install ${{env.INSTALL_DIR}}
 
       - name: Update configure file
         working-directory: ${{github.workspace}}

Script/build_debpackage.sh

@@ -1,3 +1,10 @@
+#!/bin/bash
+# Author: Kang Lin <kl222@126.com>
+
+#See: https://blog.csdn.net/alwaysbefine/article/details/114187380
+#set -x
+set -e
+#set -v
 
 if [ -z "$BUILD_VERBOSE" ]; then
     BUILD_VERBOSE=OFF