From 17300ff51084fd178409c04929f1a8da895af324 Mon Sep 17 00:00:00 2001 From: gfdgd_xi <3025613752@qq.com> Date: Tue, 12 Nov 2024 13:13:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8F=91=E8=A1=8C=E7=89=88?= =?UTF-8?q?=E4=BB=A3=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/building-deb-sid.yml | 4 ++-- .github/workflows/building-deb.yml | 4 ++-- .../workflows/configure-building-enviroment-base-system.sh | 1 + .github/workflows/configure-building-enviroment.sh | 6 +++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/building-deb-sid.yml b/.github/workflows/building-deb-sid.yml index 649438f..6cd6c2b 100644 --- a/.github/workflows/building-deb-sid.yml +++ b/.github/workflows/building-deb-sid.yml @@ -35,8 +35,8 @@ jobs: - 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/ + bash .github/workflows/configure-building-enviroment-base-system.sh loong64 sid $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian-ports/ + #bash .github/workflows/configure-building-enviroment-base-system.sh loong64 sid $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian-ports/ - name: Building ${{ GITHUB.repository }} run: | diff --git a/.github/workflows/building-deb.yml b/.github/workflows/building-deb.yml index ba7b5ef..15ee02c 100755 --- a/.github/workflows/building-deb.yml +++ b/.github/workflows/building-deb.yml @@ -209,8 +209,8 @@ jobs: - 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/ + bash .github/workflows/configure-building-enviroment-base-system.sh loong64 sid $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian-ports/ + #bash .github/workflows/configure-building-enviroment-base-system.sh loong64 sid $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian-ports/ - name: Building ${{ GITHUB.repository }} run: | diff --git a/.github/workflows/configure-building-enviroment-base-system.sh b/.github/workflows/configure-building-enviroment-base-system.sh index 1f2aadb..0823a28 100755 --- a/.github/workflows/configure-building-enviroment-base-system.sh +++ b/.github/workflows/configure-building-enviroment-base-system.sh @@ -42,6 +42,7 @@ if [[ $6 == "backport" ]]; then sudo cp -rv .github/workflows/90bookworm-backports $bottlePath/etc/apt/preferences.d/ fi # 配置 git +#echo "deb [trusted=true] https://deb.debian.org/debian-ports/ unreleased main" | sudo tee $bottlePath/etc/apt/sources.list.d/debian-unreleased.list sudo chroot $bottlePath apt update sudo chroot $bottlePath apt full-upgrade -y sudo chroot $bottlePath apt install git -y diff --git a/.github/workflows/configure-building-enviroment.sh b/.github/workflows/configure-building-enviroment.sh index 5ef1b18..34c7c6d 100755 --- a/.github/workflows/configure-building-enviroment.sh +++ b/.github/workflows/configure-building-enviroment.sh @@ -23,9 +23,9 @@ 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] https://deb.debian.org/debian-ports/ unreleased main" > /etc/apt/sources.list.d/debian-unreleased.list -fi +#if [[ $(dpkg --print-architecture) == "loong64" ]]; then +# 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}; do