From 9542a6b169f790cc12fe21317e0acbbdc5797be3 Mon Sep 17 00:00:00 2001 From: gfdgd_xi <3025613752@qq.com> Date: Tue, 21 Jan 2025 12:24:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9E=84=E5=BB=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/building-deb.yml | 2 +- .../workflows/configure-building-enviroment-base-system.sh | 6 +++++- .github/workflows/configure-building-enviroment.sh | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/building-deb.yml b/.github/workflows/building-deb.yml index 9d63796..4ae8bb3 100755 --- a/.github/workflows/building-deb.yml +++ b/.github/workflows/building-deb.yml @@ -358,7 +358,7 @@ jobs: ssh-keyscan -p $UPORT -H $UHOST >> ~/.ssh/known_hosts tarName=$(ls | grep .tar | head -n 1) sshpass -p "$UPASSWD" rsync -e "ssh -p $UPORT" $tarName $UUSERS@$UHOST:$UPATH - sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM maolong $UPATH/$tarName > /dev/null + sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM erliang $UPATH/$tarName > /dev/null riscv64: runs-on: ubuntu-24.04 diff --git a/.github/workflows/configure-building-enviroment-base-system.sh b/.github/workflows/configure-building-enviroment-base-system.sh index d74622b..35c3061 100755 --- a/.github/workflows/configure-building-enviroment-base-system.sh +++ b/.github/workflows/configure-building-enviroment-base-system.sh @@ -59,5 +59,9 @@ sudo chroot $bottlePath git clone $4 #--depth=1 sudo mv $bottlePath/$(basename $3)/.github/workflows/* $bottlePath/$(basename $4)/.github/workflows -v # 修改版本号 #sudo sed -i "s/) UNRELEASED; urgency=medium/~$2) UNRELEASED; urgency=medium/g" $bottlePath/deep-wine-runner-qemu-system/debian/changelog -env gitPath=$(basename $4) bash .github/workflows/run-command-in-chroot.sh .github/workflows/configure-building-enviroment.sh +if [[ $2 == "loongnix" ]]; then + env gitPath=$(basename $4) bash .github/workflows/run-command-in-chroot.sh .github/workflows/configure-building-enviroment.sh erliang +else + env gitPath=$(basename $4) bash .github/workflows/run-command-in-chroot.sh .github/workflows/configure-building-enviroment.sh +fi exit 0 \ No newline at end of file diff --git a/.github/workflows/configure-building-enviroment.sh b/.github/workflows/configure-building-enviroment.sh index 4f55308..d6d1a06 100755 --- a/.github/workflows/configure-building-enviroment.sh +++ b/.github/workflows/configure-building-enviroment.sh @@ -16,9 +16,9 @@ export DEBIAN_FRONTEND=noninteractive # 防止卡 tzdate #fi # 写入 GXDE 源 # 判断是否是 Ubuntu -isUbuntu=$(cat /etc/os-release | grep Ubuntu | wc -l) -if [[ $isUbuntu -gt 1 ]]; then - echo "deb [trusted=true] https://repo.gxde.org/gxde-os/hetao ./" >> /etc/apt/sources.list.d/gxde-os.list +#isUbuntu=$(cat /etc/os-release | grep Ubuntu | wc -l) +if [[ $1 == "erliang" ]]; then + echo "deb [trusted=true] https://repo.gxde.org/gxde-os/erliang ./" >> /etc/apt/sources.list.d/gxde-os.list else echo "deb [trusted=true] https://repo.gxde.org/gxde-os/tianlu ./" >> /etc/apt/sources.list.d/gxde-os.list echo "deb [trusted=true] https://repo.gxde.org/gxde-os/bixie ./" >> /etc/apt/sources.list.d/gxde-os.list