Skip to content

Commit 770f1ee

Browse files
committed
Script: add build appimage in fedora
1 parent 713aab8 commit 770f1ee

2 files changed

Lines changed: 24 additions & 3 deletions

File tree

.github/workflows/docker.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,14 @@ jobs:
5959
image: ubuntu
6060
lable: "25.04"
6161
os: ubuntu-24.04-arm
62+
- PACKAGE: appimage
63+
image: fedora
64+
lable: "43"
65+
os: ubuntu-24.04
66+
- PACKAGE: appimage
67+
image: fedora
68+
lable: "43"
69+
os: ubuntu-24.04-arm
6270

6371
- PACKAGE: rpm
6472
image: fedora

Script/build_linux.sh

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -367,10 +367,20 @@ if [ $DOCKER -eq 1 ]; then
367367
cp \${SOURCE_CODE_DIR}/rabbitremotecontrol*.deb /home/build/
368368
"
369369
fi
370+
370371
if [ $APPIMAGE -eq 1 ]; then
371-
if [[ "$DOCKER_IMAGE" =~ ^(ubuntu|debian) ]]; then
372+
#if [[ "$DOCKER_IMAGE" =~ ^(ubuntu|debian) ]]; then
373+
# DOCKER_PARA="-e DEBIAN_FRONTEND=noninteractive -e TZ=UTC"
374+
#fi
375+
case "$DISTRO" in
376+
ubuntu|debian)
372377
DOCKER_PARA="-e DEBIAN_FRONTEND=noninteractive -e TZ=UTC"
373-
fi
378+
;;
379+
fedora)
380+
# Install getopt
381+
dnf install -y util-linux
382+
;;
383+
esac
374384
docker run --privileged ${DOCKER_PARA} \
375385
-e CI=${CI} \
376386
--volume ${REPO_ROOT}:/home/RabbitRemoteControl \
@@ -398,6 +408,7 @@ if [ $DOCKER -eq 1 ]; then
398408
popd
399409
"
400410
fi
411+
401412
if [ $RPM -eq 1 ]; then
402413
docker run --volume ${BUILD_LINUX_DIR}:/home/build \
403414
--volume ${INSTALL_DIR}:/home/install \
@@ -467,6 +478,8 @@ if [ $APPIMAGE -eq 1 ]; then
467478
depend_para="$depend_para --freerdp --libssh --qtermwidget --qtkeychain --qftpserver"
468479
;;
469480
fedora)
481+
depend_para="$depend_para --qftpserver"
482+
#dnf builddep -y ${REPO_ROOT}/Package/rpm/rabbitremotecontrol.spec
470483
;;
471484
*)
472485
esac
@@ -496,7 +509,7 @@ fi
496509

497510
if [ $RPM -eq 1 ]; then
498511
echo "build rpm package ......"
499-
dnf builddep -y ${REPO_ROOT}/Package/rpm/rabbitremotecontrol.spec
512+
#dnf builddep -y ${REPO_ROOT}/Package/rpm/rabbitremotecontrol.spec
500513
./build_depend.sh --system_update --base --default --package-tool=dnf \
501514
--rabbitcommon --tigervnc --pcapplusplus --qftpserver \
502515
--install=${INSTALL_DIR} \

0 commit comments

Comments
 (0)