CI: modify docker.yml

KangLin · KangLin · commit 1649b8246f11 · 2025-11-17T15:48:50.000+08:00
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -19,12 +19,22 @@ jobs:
         variant:
           - PACKAGE: deb
             image: ubuntu
-            lable: ":24.04"
+            lable: ":25.04"
             os: ubuntu-24.04
           - PACKAGE: deb
             image: ubuntu
-            lable: ":24.04"
+            lable: ":25.04"
             os: ubuntu-24.04-arm
+
+          - PACKAGE: appimage
+            image: ubuntu
+            lable: ":25.04"
+            os: ubuntu-24.04
+          - PACKAGE: appimage
+            image: ubuntu
+            lable: ":25.04"
+            os: ubuntu-24.04-arm
+
           - PACKAGE: rpm
             image: fedora
             lable: ":41"
@@ -56,10 +66,26 @@ jobs:
       - name: run docker
         run: |
           ./Script/build_linux.sh --docker --docker-image="${{matrix.variant.image}}${{matrix.variant.lable}}" --${{matrix.variant.PACKAGE}}
+
+      - name: AppIagme update configure file
+        if: ${{ matrix.variant.PACKAGE == 'appimage' }}
+        #continue-on-error: true
+        run: |
+          sudo Xvfb :91.0 -ac -screen 0 1200x900x24 &
+          sleep 1
+          export DISPLAY=:91.0
+          echo "Update update_linux.json ......"
+          export QT_XCB_GL_INTEGRATION=none
+          #export QT_DEBUG_PLUGINS=1
+          ARCH=`uname -m`
+          cp ${{github.workspace}}/build_linux/RabbitRemoteControl_${ARCH}.AppImage RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_${ARCH}.AppImage
+  
       - name: Update artifact
-        if: ${{matrix.variant.PACKAGE == 'rpm'}}
+        #if: ${{matrix.variant.PACKAGE != 'deb'}}
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name }}_${{matrix.variant.PACKAGE}}_${{matrix.variant.image}}_${{matrix.variant.os}}
           path: |
             ${{github.workspace}}/build_linux/rabbitremotecontrol*.rpm
+            ${{github.workspace}}/build_linux/rabbitremotecontrol_*.deb
+            ${{github.workspace}}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_${ARCH}.AppImage
diff --git a/Package/Flatpak/io.github.KangLin.RabbitRemoteControl.yml b/Package/Flatpak/io.github.KangLin.RabbitRemoteControl.yml
@@ -3,12 +3,12 @@ id: "io.github.KangLin.RabbitRemoteControl"
 # See: [available runtimes](https://docs.flatpak.org/en/latest/available-runtimes.html)
 # See: [flatpak kde runtime](https://invent.kde.org/packaging/flatpak-kde-runtime)
 runtime: "org.kde.Platform"
-runtime-version: "6.8"
+runtime-version: "6.9"
 sdk: "org.kde.Sdk"
 command: RabbitRemoteControlApp
 
 base: io.qt.qtwebengine.BaseApp
-base-version: '6.8'
+base-version: '6.9'
 cleanup-commands:
   - /app/cleanup-BaseApp.sh
 
diff --git a/Plugins/FileTransfer/OperateFileTransfer.h b/Plugins/FileTransfer/OperateFileTransfer.h
@@ -13,6 +13,7 @@
 class COperateFileTransfer : public COperate
 {
     Q_OBJECT
+
 public:
     explicit COperateFileTransfer(CPlugin *plugin);
     virtual ~COperateFileTransfer();
@@ -26,7 +27,7 @@ class COperateFileTransfer : public COperate
      *        if don't use, the caller must delete it.
      * \~see CBackendThread
      */
-    [[nodiscard]] Q_INVOKABLE virtual CBackend* InstanceBackend();
+    Q_INVOKABLE virtual CBackend* InstanceBackend();
 
     virtual const QString Id() override;
     virtual const QString Name() override;
diff --git a/Script/build_appimage.sh b/Script/build_appimage.sh
@@ -161,7 +161,7 @@ fi
 popd
 
 echo "Compile RabbitRemoteControl ......"
-if [ "${BUILD_VERBOSE}" = "ON" ]; then
+if [ "${BUILD_VERBOSE}" = "ON" -a -n "$QMAKE" ]; then
     echo "QT_ROOT: $QT_ROOT"
     echo "Qt6_DIR: $Qt6_DIR"
     echo "QMAKE: $QMAKE"
@@ -207,7 +207,7 @@ export DEPLOY_PLATFORM_THEMES=true
 export EXTRA_QT_MODULES="svg"
 export PATH=$PATH:${TOOLS_DIR}
 
-if [ "${BUILD_VERBOSE}" = "ON" ]; then
+if [ "${BUILD_VERBOSE}" = "ON" -a -n "$QMAKE" ]; then
     echo "QT_ROOT: $QT_ROOT"
     echo "Qt6_DIR: $Qt6_DIR"
     echo "QMAKE: $QMAKE"
diff --git a/Script/build_depend.sh b/Script/build_depend.sh
@@ -319,7 +319,7 @@ if [ $BASE_LIBS -eq 1 ]; then
         apt install -y -q libgl1-mesa-dev libglx-dev libglu1-mesa-dev libvulkan-dev mesa-common-dev
         # Virtual desktop (virtual framebuffer X server for X Version 11). Needed by CI
         if [ -z "$RabbitRemoteControl_VERSION" ]; then
-            apt install -y -q xvfb xpra
+            apt install -y -q xvfb #xpra
         fi
         # X11 and xcb
         apt install -y -q xorg-dev x11-xkb-utils libxkbcommon-dev libxkbcommon-x11-dev libx11-xcb-dev \
@@ -382,13 +382,22 @@ fi
 if [ $DEFAULT_LIBS -eq 1 ]; then
     echo "Install default dependency libraries ......"
     if [ "$PACKAGE_TOOL" = "apt" ]; then
+        case "`lsb_release -s -r`" in
+            "25.04"|"25.10")
+                DEFAULT_LIBRARIES=
+            ;;
+            "24.04"|"24.10"|*)
+                DEFAULT_LIBRARIES=
+                ;;
+            
+        esac
         # Qt6
         apt-get install -y -q qmake6 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-websockets-dev \
+            qt6-scxml-dev qt6-multimedia-dev qt6-websockets-dev qt6-serialport-dev \
             qt6-webengine-dev qt6-webengine-dev-tools qt6-positioning-dev qt6-webchannel-dev
-        apt-get install -y -q freerdp2-dev qtkeychain-qt6-dev
+        apt-get install -y -q freerdp2-dev qtkeychain-qt6-dev $DEFAULT_LIBRARIES
     fi
     
     if [ "$PACKAGE_TOOL" = "dnf" ]; then
diff --git a/Script/build_linux.sh b/Script/build_linux.sh
@@ -214,6 +214,8 @@ if [ $DOCKER -eq 1 ]; then
         docker run --volume ${BUILD_LINUX_DIR}:/home/build --privileged --interactive --rm ${DOCKERT_IMAGE} \
             bash -e -x -c "
             tar -C ~ -xf /home/build/RabbitRemoteControl.tar.gz
+            apt-get update -y
+            apt-get install lsb-release
             ~/RabbitRemoteControl/Script/build_linux.sh --appimage --verbose ${BUILD_VERBOSE}
             cp ~/RabbitRemoteControl/RabbitRemoteControl_`uname -m`.AppImage /home/build/
             "
@@ -260,22 +262,32 @@ fi
 
 if [ $APPIMAGE -eq 1 ]; then
     echo "build AppImage(qt${QT_VERSION}) ......"
+    case "`lsb_release -s -r`" in
+        "25.04"|"25.10")
+            depend_para="--default"
+            export PKG_CONFIG_PATH=${INSTALL_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH
+            export LD_LIBRARY_PATH=${INSTALL_DIR}/lib:$LD_LIBRARY_PATH
+            export CMAKE_PREFIX_PATH=${INSTALL_DIR}:${CMAKE_PREFIX_PATH}
+            ;;
+        "24.04"|"24.10")
+            depend_para="--qt=${QT_VERSION}"
+            export QT_ROOT=${TOOLS_DIR}/qt_`uname -m`
+            export Qt6_DIR=$QT_ROOT
+            export QMAKE=$QT_ROOT/bin/qmake
+            export QT_PLUGIN_PATH=$QT_ROOT/plugins
+            export PATH=$QT_ROOT/libexec:$PATH
+            export PKG_CONFIG_PATH=$QT_ROOT/lib/pkgconfig:${INSTALL_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH
+            export LD_LIBRARY_PATH=$QT_ROOT/lib:${INSTALL_DIR}/lib:$LD_LIBRARY_PATH
+            export CMAKE_PREFIX_PATH=$QT_ROOT:${INSTALL_DIR}:${CMAKE_PREFIX_PATH}
+            ;;
+    esac
     ./build_depend.sh --system_update --base --rabbitcommon \
         --tigervnc --freerdp --pcapplusplus --libssh \
         --install=${INSTALL_DIR} \
         --source=${SOURCE_DIR} \
         --tools=${TOOLS_DIR} \
-        --verbose=${BUILD_VERBOSE} \
-        --qt=${QT_VERSION}
+        --verbose=${BUILD_VERBOSE} ${depend_para}
 
-    export QT_ROOT=${TOOLS_DIR}/qt_`uname -m`
-    export Qt6_DIR=$QT_ROOT
-    export QMAKE=$QT_ROOT/bin/qmake
-    export PATH=$QT_ROOT/libexec:$PATH
-    export PKG_CONFIG_PATH=$QT_ROOT/lib/pkgconfig:${INSTALL_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH
-    export LD_LIBRARY_PATH=$QT_ROOT/lib:${INSTALL_DIR}/lib:$LD_LIBRARY_PATH
-    export QT_PLUGIN_PATH=$QT_ROOT/plugins
-    export CMAKE_PREFIX_PATH=$QT_ROOT:${INSTALL_DIR}:${CMAKE_PREFIX_PATH}
     export RabbitCommon_ROOT=${SOURCE_DIR}/RabbitCommon
     export BUILD_FREERDP=ON
 
