CI: modify docker.yml

Author: KangLin

.github/workflows/docker.yml

@@ -25,6 +25,22 @@ jobs:
             image: ubuntu
             lable: ":24.04"
             os: ubuntu-24.04-arm
+          - PACKAGE: deb
+            image: ubuntu
+            lable: ":25.04"
+            os: ubuntu-24.04
+          - PACKAGE: deb
+            image: ubuntu
+            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"

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

Script/build_linux.sh

@@ -216,6 +216,8 @@ if [ $DOCKER -eq 1 ]; then
             tar -C ~ -xf /home/build/RabbitRemoteControl.tar.gz
             ~/RabbitRemoteControl/Script/build_linux.sh --appimage --verbose ${BUILD_VERBOSE}
             cp ~/RabbitRemoteControl/RabbitRemoteControl_`uname -m`.AppImage /home/build/
+            apt-get update -y
+            apt-get install lsb-release
             "
     fi
     if [ $RPM -eq 1 ]; then
@@ -260,13 +262,22 @@ 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"
+        ;;
+        "24.04"|"24.10"|*)
+            depend_para="--qt=${QT_VERSION}"
+            ;;
+        
+    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}
+        ${depend_para}
 
     export QT_ROOT=${TOOLS_DIR}/qt_`uname -m`
     export Qt6_DIR=$QT_ROOT