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