From 0f073670f2fea15214aae17ba0c6b2b0bdddf6eb Mon Sep 17 00:00:00 2001
From: gfdgd_xi <3025613752@qq.com>
Date: Mon, 14 Oct 2024 22:15:01 +0800
Subject: [PATCH] ubuntu test

---
 .github/workflows/building-deb.yml            | 48 ++++++++++++++++++-
 .../configure-building-enviroment.sh          | 10 +++-
 2 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/building-deb.yml b/.github/workflows/building-deb.yml
index 98f7864..74339b6 100755
--- a/.github/workflows/building-deb.yml
+++ b/.github/workflows/building-deb.yml
@@ -65,7 +65,7 @@ jobs:
           sshpass -p "$UPASSWD" rsync -e "ssh -p $UPORT" $tarName $UUSERS@$UHOST:$UPATH
           sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM $UPATH/$tarName > /dev/null
 
-  amd64:
+  amd64-Debian12:
     runs-on: ubuntu-latest
     steps:
       - name: Clone Repository To Get Script
@@ -293,4 +293,48 @@ jobs:
             sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM $UPATH/$tarName > /dev/null
           fi
 
-      
\ No newline at end of file
+  amd64-ubuntu24:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Clone Repository To Get Script
+        run: |
+          git clone $REPOSITORY --depth=1
+          mv $(basename $REPOSITORY)/* . -v
+          mv $(basename $REPOSITORY)/.* . -v | true
+
+      - name: Configure Base System
+        run: |
+          git clone https://github.com/$GITHUB_REPOSITORY 
+          cd $GITHUB_REPOSITORY 
+          bash ../.github/workflows/configure-building-enviroment.sh
+
+      - name: Building ${{ GITHUB.repository }}
+        run: |
+          cd $GITHUB_REPOSITORY 
+          env GO111MODULE=off dpkg-buildpackage -b
+
+      - name: Remove Debug Package
+        run: |
+          rm -rfv *dbg*.deb
+
+      - name: Pack tar
+        run: |
+          sudo tar -cvf deb-$(date +%s).tar *.deb 
+
+      - name: Push
+        env: 
+          UPASSWD: ${{ secrets.PASSWD }}
+          UUSERS: ${{ secrets.USERS }}
+          UHOST: ${{ secrets.HOST }}
+          UPATH: ${{ secrets.UPATH }}
+          UPROGRAM: ${{ secrets.UPROGRAM }}
+          UPORT: ${{ secrets.UPORT }}
+        run: |
+          sudo apt update
+          sudo apt install sshpass -y
+          mkdir -p ~/.ssh/
+          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 $UPATH/$tarName > /dev/null
+  
\ No newline at end of file
diff --git a/.github/workflows/configure-building-enviroment.sh b/.github/workflows/configure-building-enviroment.sh
index d344e09..ca6f660 100755
--- a/.github/workflows/configure-building-enviroment.sh
+++ b/.github/workflows/configure-building-enviroment.sh
@@ -15,8 +15,14 @@ export DEBIAN_FRONTEND=noninteractive  # 防止卡 tzdate
 #    echo "deb-src http://deb.debian.org/debian sid main" > /etc/apt/sources.list.d/debian-sources.list
 #fi
 # 写入 GXDE 源
-echo "deb [trusted=true] https://repo1.gxde.top/gxde-os/tianlu ./" >> /etc/apt/sources.list.d/gxde-os.list
-echo "deb [trusted=true] https://repo1.gxde.top/gxde-os/bixie ./" >> /etc/apt/sources.list.d/gxde-os.list
+# 判断是否是 Ubuntu
+isUbuntu=$(cat /etc/os-release | grep Ubuntu | wc -l)
+if [[ $isUbuntu -gt 1 ]]; then
+    echo "deb [trusted=true] https://repo1.gxde.top/gxde-os/hetao ./" >> /etc/apt/sources.list.d/gxde-os.list
+else
+    echo "deb [trusted=true] https://repo1.gxde.top/gxde-os/tianlu ./" >> /etc/apt/sources.list.d/gxde-os.list
+    echo "deb [trusted=true] https://repo1.gxde.top/gxde-os/bixie ./" >> /etc/apt/sources.list.d/gxde-os.list
+fi
 if [[ $(dpkg --print-architecture) == "loong64" ]]; then
     echo "deb [trusted=true] http://deb.debian.org/debian-ports unreleased main" > /etc/apt/sources.list.d/debian-unreleased.list
 fi