Skip to content

Commit 4644427

Browse files
committed
CI: modify docker.yml
1 parent a0e1d09 commit 4644427

File tree

2 files changed

+25
-1
lines changed

2 files changed

+25
-1
lines changed

.github/workflows/docker.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,22 @@ jobs:
2525
image: ubuntu
2626
lable: ":24.04"
2727
os: ubuntu-24.04-arm
28+
- PACKAGE: deb
29+
image: ubuntu
30+
lable: ":25.04"
31+
os: ubuntu-24.04
32+
- PACKAGE: deb
33+
image: ubuntu
34+
lable: ":25.04"
35+
os: ubuntu-24.04-arm
36+
- PACKAGE: appimage
37+
image: ubuntu
38+
lable: ":25.04"
39+
os: ubuntu-24.04
40+
- PACKAGE: appimage
41+
image: ubuntu
42+
lable: ":25.04"
43+
os: ubuntu-24.04-arm
2844
- PACKAGE: rpm
2945
image: fedora
3046
lable: ":41"

Script/build_linux.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,13 +260,21 @@ fi
260260

261261
if [ $APPIMAGE -eq 1 ]; then
262262
echo "build AppImage(qt${QT_VERSION}) ......"
263+
case "`lsb_release -s -r`" in
264+
"24.04"|"24.10")
265+
depend_para="--qt=${QT_VERSION}"
266+
;;
267+
"25.04")
268+
depend_para="--default"
269+
;;
270+
esac
263271
./build_depend.sh --system_update --base --rabbitcommon \
264272
--tigervnc --freerdp --pcapplusplus --libssh \
265273
--install=${INSTALL_DIR} \
266274
--source=${SOURCE_DIR} \
267275
--tools=${TOOLS_DIR} \
268276
--verbose=${BUILD_VERBOSE} \
269-
--qt=${QT_VERSION}
277+
${depend_para}
270278

271279
export QT_ROOT=${TOOLS_DIR}/qt_`uname -m`
272280
export Qt6_DIR=$QT_ROOT

0 commit comments

Comments
 (0)