From d0b88cd45164fe792f43d087b5955af2dc045541 Mon Sep 17 00:00:00 2001 From: gfdgd_xi <3025613752@qq.com> Date: Tue, 12 Nov 2024 12:56:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=BB=9A=E5=8A=A8=E6=9E=84?= =?UTF-8?q?=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/building-deb-backport.yml | 2 +- .github/workflows/building-deb-sid.yml | 123 ++++++++++++++++++ .github/workflows/building-deb.yml | 2 +- .github/workflows/building.yml | 2 +- .../configure-building-enviroment.sh | 2 +- 5 files changed, 127 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/building-deb-sid.yml diff --git a/.github/workflows/building-deb-backport.yml b/.github/workflows/building-deb-backport.yml index 38bac94..4031cc7 100755 --- a/.github/workflows/building-deb-backport.yml +++ b/.github/workflows/building-deb-backport.yml @@ -208,7 +208,7 @@ jobs: - name: Configure Base System run: | - bash .github/workflows/configure-building-enviroment-base-system.sh loong64 unstable $REPOSITORY https://packages.gxde.org/debian-loong64/ + bash .github/workflows/configure-building-enviroment-base-system.sh loong64 unstable $REPOSITORY https://deb.debian.org/debian-ports/ #bash .github/workflows/configure-building-enviroment-base-system.sh loong64 unstable $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian-ports/ - name: Building ${{ GITHUB.repository }} diff --git a/.github/workflows/building-deb-sid.yml b/.github/workflows/building-deb-sid.yml new file mode 100644 index 0000000..649438f --- /dev/null +++ b/.github/workflows/building-deb-sid.yml @@ -0,0 +1,123 @@ +name: Building GXDE Testing SID Package +run-name: Building SID ${{ GITHUB.REPOSITORY }} + +on: + workflow_call: + secrets: + PASSWD: + required: true + USERS: + required: true + HOST: + required: true + UPATH: + required: true + UPROGRAM: + required: true + UPORT: + required: true + +env: + REPOSITORY: https://github.com/GXDE-OS/GXDE + BOTTLEPATH: system-bottle + +jobs: + loong64: + runs-on: ubuntu-24.04 + steps: + - name: Clone Repository To Get Script + run: | + #apt update + #apt install sudo git -y + git clone $REPOSITORY --depth=1 + mv $(basename $REPOSITORY)/* . -v + mv $(basename $REPOSITORY)/.* . -v | true + + - name: Configure Base System + run: | + bash .github/workflows/configure-building-enviroment-base-system.sh loong64 unstable $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian-ports/ + #bash .github/workflows/configure-building-enviroment-base-system.sh loong64 unstable $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian-ports/ + + - name: Building ${{ GITHUB.repository }} + run: | + env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh env GO111MODULE=off dpkg-buildpackage -b + + - name: Remove Debug Package + run: | + env env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh rm -rfv ../*dbg*.deb + + - name: Pack tar + run: | + cd $BOTTLEPATH + 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 tianlu $UPATH/$tarName > /dev/null + + + + riscv64: + runs-on: ubuntu-24.04 + steps: + - name: Clone Repository To Get Script + run: | + #apt update + #apt install sudo git -y + git clone $REPOSITORY --depth=1 + mv $(basename $REPOSITORY)/* . -v + mv $(basename $REPOSITORY)/.* . -v | true + + - name: Configure Base System + run: | + bash .github/workflows/configure-building-enviroment-base-system.sh riscv64 sid $REPOSITORY https://github.com/$GITHUB_REPOSITORY + + - name: Building ${{ GITHUB.repository }} + run: | + set +e + env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh env GO111MODULE=off dpkg-buildpackage -b + + - name: Remove Debug Package + run: | + set +e + env env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh rm -rfv ../*dbg*.deb + + - name: Pack tar + run: | + set +e + cd $BOTTLEPATH + 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: | + set +e + 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) + if [[ $tarName != "" ]]; then + sshpass -p "$UPASSWD" rsync -e "ssh -p $UPORT" $tarName $UUSERS@$UHOST:$UPATH > /dev/null + sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM tianlu $UPATH/$tarName > /dev/null + fi + diff --git a/.github/workflows/building-deb.yml b/.github/workflows/building-deb.yml index c798c24..ba7b5ef 100755 --- a/.github/workflows/building-deb.yml +++ b/.github/workflows/building-deb.yml @@ -209,7 +209,7 @@ jobs: - name: Configure Base System run: | - bash .github/workflows/configure-building-enviroment-base-system.sh loong64 unstable $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://packages.gxde.org/debian-loong64/ + bash .github/workflows/configure-building-enviroment-base-system.sh loong64 unstable $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian-ports/ #bash .github/workflows/configure-building-enviroment-base-system.sh loong64 unstable $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian-ports/ - name: Building ${{ GITHUB.repository }} diff --git a/.github/workflows/building.yml b/.github/workflows/building.yml index 047c158..664aba2 100644 --- a/.github/workflows/building.yml +++ b/.github/workflows/building.yml @@ -1,4 +1,4 @@ -name: Building Testing +name: Building Program run-name: Building ${{ GITHUB.REPOSITORY }} on: diff --git a/.github/workflows/configure-building-enviroment.sh b/.github/workflows/configure-building-enviroment.sh index 7bdcb46..5ef1b18 100755 --- a/.github/workflows/configure-building-enviroment.sh +++ b/.github/workflows/configure-building-enviroment.sh @@ -24,7 +24,7 @@ else 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] https://packages.gxde.org/debian-loong64/ unreleased main" > /etc/apt/sources.list.d/debian-unreleased.list + echo "deb [trusted=true] https://deb.debian.org/debian-ports/ unreleased main" > /etc/apt/sources.list.d/debian-unreleased.list fi apt install debian-ports-archive-keyring debian-archive-keyring -y for i in {1..8};