diff --git a/.github/workflows/building-deb-hetao.yml b/.github/workflows/building-deb-hetao.yml new file mode 100755 index 0000000..d0139f2 --- /dev/null +++ b/.github/workflows/building-deb-hetao.yml @@ -0,0 +1,34 @@ +name: Building GXDE Package (hetao) +run-name: Building ${{ 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: + call-loong64-hetao: + uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master + secrets: inherit + with: + display-name: loong64-hetao + arch: loong64 + rootfs-codename: crimson + rootfs-source: https://community-packages.deepin.com/deepin/beige/ + gxde-codename: hetao + gxde-codename-upload: hetao diff --git a/.github/workflows/building-deb-newest.yml b/.github/workflows/building-deb-newest.yml index 8d39f5c..c50a128 100644 --- a/.github/workflows/building-deb-newest.yml +++ b/.github/workflows/building-deb-newest.yml @@ -37,6 +37,6 @@ jobs: uses: GXDE-OS/GXDE/.github/workflows/building-deb-zhuangzhuang.yml@master secrets: inherit - call-meimei: - uses: GXDE-OS/GXDE/.github/workflows/building-deb-meimei.yml@master + call-hetao: + uses: GXDE-OS/GXDE/.github/workflows/building-deb-hetao.yml@master secrets: inherit \ No newline at end of file diff --git a/.github/workflows/building-deb.yml b/.github/workflows/building-deb.yml index 5ac5b2d..2db64e4 100755 --- a/.github/workflows/building-deb.yml +++ b/.github/workflows/building-deb.yml @@ -26,8 +26,8 @@ jobs: uses: GXDE-OS/GXDE/.github/workflows/building-deb-zhuangzhuang.yml@master secrets: inherit - call-meimei: - uses: GXDE-OS/GXDE/.github/workflows/building-deb-meimei.yml@master + call-hetao: + uses: GXDE-OS/GXDE/.github/workflows/building-deb-hetao.yml@master secrets: inherit call-tianlu: diff --git a/.github/workflows/configure-building-enviroment-base-system.sh b/.github/workflows/configure-building-enviroment-base-system.sh index 4086d98..63cff66 100755 --- a/.github/workflows/configure-building-enviroment-base-system.sh +++ b/.github/workflows/configure-building-enviroment-base-system.sh @@ -18,6 +18,9 @@ function useDebianPort() { function useLoongnix() { sudo cp .github/workflows/loongnix /usr/share/debootstrap/scripts/ -v } +function useDeepin25() { + sudo cp .github/workflows/crimson /usr/share/debootstrap/scripts/ -v +} sudo apt update sudo apt install debootstrap rename binfmt-support qemu-user qemu-user-static git -y @@ -32,7 +35,14 @@ else useLoongnix fi fi +if [[ $2 == "crimson" ]]; then + useDeepin25 +fi sudo debootstrap --no-check-gpg --include=git,gcc,make,debian-ports-archive-keyring,debian-archive-keyring,g++,dpkg-dev,qtbase5-dev,ca-certificates --arch=$1 $2 $bottlePath $5 + +if [[ $2 == "crimson" ]]; then + sudo sed -i "s/main/main commercial community/g" $bottlePath/etc/apt/sources.list +fi #if [[ $? != 0 ]]; then # sudo debootstrap --foreign --include=git,gcc,make,debian-ports-archive-keyring,debian-archive-keyring,g++,dpkg-dev,qtbase5-dev,ca-certificates --arch=$1 $2 $bottlePath $5 #fi @@ -67,6 +77,9 @@ case $2 in "loongnix") env gitPath=$(basename $4) bash .github/workflows/run-command-in-chroot.sh .github/workflows/configure-building-enviroment.sh meimei ;; + "crimson") + env gitPath=$(basename $4) bash .github/workflows/run-command-in-chroot.sh .github/workflows/configure-building-enviroment.sh hetao + ;; *) env gitPath=$(basename $4) bash .github/workflows/run-command-in-chroot.sh .github/workflows/configure-building-enviroment.sh ;; diff --git a/.github/workflows/crimson b/.github/workflows/crimson new file mode 100644 index 0000000..6b71de5 --- /dev/null +++ b/.github/workflows/crimson @@ -0,0 +1,17 @@ +mirror_style release +download_style apt +finddebs_style from-indices +variants - buildd fakechroot minbase +keyring /usr/share/keyrings/debian-archive-keyring.gpg +default_mirror https://community-packages.deepin.com/deepin/beige/ + +# include common settings +if [ -e "$DEBOOTSTRAP_DIR/scripts/debian-common" ]; then + . "$DEBOOTSTRAP_DIR/scripts/debian-common" +elif [ -e /debootstrap/debian-common ]; then + . /debootstrap/debian-common +elif [ -e "$DEBOOTSTRAP_DIR/debian-common" ]; then + . "$DEBOOTSTRAP_DIR/debian-common" +else + error 1 NOCOMMON "File not found: debian-common" +fi