From 4e9d928ccc8d664dcdc819a61a03e19ad57f7edf Mon Sep 17 00:00:00 2001
From: gfdgd_xi <3025613752@qq.com>
Date: Sun, 22 Jun 2025 07:52:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=BE=E7=BD=AEtag?=
 =?UTF-8?q?=E5=90=8E=E4=BE=9D=E6=97=A7=E5=8F=AA=E4=BC=9A=E6=9E=84=E5=BB=BA?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=88=86=E6=94=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/.github/workflows/building-deb-base.yml b/.github/workflows/building-deb-base.yml
index de76ae0..d1c1782 100755
--- a/.github/workflows/building-deb-base.yml
+++ b/.github/workflows/building-deb-base.yml
@@ -89,11 +89,13 @@ jobs:
           if [[ ${{ inputs.gxde-is-backport }} == true ]]; then
             isBackport=backport
           fi
+          export REPO_BRANCH=${{ github.ref_name }}
           bash .github/workflows/configure-building-enviroment-base-system.sh ${{ inputs.arch }} \
             ${{ inputs.rootfs-codename }} \
             $REPOSITORY \
             https://github.com/$GITHUB_REPOSITORY \
             ${{ inputs.rootfs-source }} \
+            ${{ github.ref_name }} \
             $isBackport
 
       - name: Building ${{ GITHUB.repository }}
diff --git a/.github/workflows/configure-building-enviroment-base-system.sh b/.github/workflows/configure-building-enviroment-base-system.sh
index 9c0a35f..b0b4d70 100755
--- a/.github/workflows/configure-building-enviroment-base-system.sh
+++ b/.github/workflows/configure-building-enviroment-base-system.sh
@@ -56,7 +56,7 @@ if [[ $? != 0 ]] && [[ $1 == loong64 ]] && [[ $2 != "loongnix" ]]; then
     sudo mv squashfs-root $bottlePath -v
 fi
 sudo bash .github/workflows/pardus-chroot $bottlePath
-if [[ $6 == "backport" ]]; then
+if [[ $7 == "backport" ]]; then
     sudo cp -rv .github/workflows/debian-backports.list $bottlePath/etc/apt/sources.list.d
     sudo mkdir -p $bottlePath/etc/apt/preferences.d/
     sudo cp -rv .github/workflows/90bookworm-backports $bottlePath/etc/apt/preferences.d/
@@ -68,7 +68,7 @@ sudo chroot $bottlePath apt update
 sudo chroot $bottlePath apt full-upgrade -y
 sudo chroot $bottlePath apt install git -y
 sudo chroot $bottlePath git clone $3 #--depth=1
-sudo chroot $bottlePath git clone $4 #--depth=1
+sudo chroot $bottlePath git clone $4 -b $6 #--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