gxde-introduction 由 Depends 设置为 Recommends

修复设置tag后依旧只会构建默认分支的问题
调整hetao自动构建源
2026-08-06 14:33:56 +08:00 · 2025-06-22 10:00:50 +08:00 · 2025-06-22 08:01:19 +08:00 · 2025-06-19 22:56:12 +08:00 · 2025-06-18 23:01:39 +08:00 · 2025-06-18 22:36:44 +08:00
7 changed files with 45 additions and 29 deletions
@@ -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 }}
@@ -22,6 +22,28 @@ env:
  BOTTLEPATH: system-bottle

 jobs:  
+  call-amd64-hetao:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: amd64-hetao
+      arch: amd64
+      rootfs-codename: crimson
+      rootfs-source: https://mirrors.kernel.org/deepin/beige/
+      gxde-codename: hetao
+      gxde-codename-upload: hetao
+
+  call-arm64-hetao:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: arm64-hetao
+      arch: arm64
+      rootfs-codename: crimson
+      rootfs-source: https://mirrors.kernel.org/deepin/beige/
+      gxde-codename: hetao
+      gxde-codename-upload: hetao
+
  call-loong64-hetao:
    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
    secrets: inherit
@@ -29,6 +51,17 @@ jobs:
      display-name: loong64-hetao
      arch: loong64
      rootfs-codename: crimson
-      rootfs-source: https://community-packages.deepin.com/deepin/beige/
+      rootfs-source: https://mirrors.kernel.org/deepin/beige/
+      gxde-codename: hetao
+      gxde-codename-upload: hetao
+
+  call-riscv64-hetao:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: riscv64-hetao
+      arch: riscv64
+      rootfs-codename: crimson
+      rootfs-source: https://mirrors.kernel.org/deepin/beige/
      gxde-codename: hetao
      gxde-codename-upload: hetao
@@ -22,17 +22,6 @@ env:
  BOTTLEPATH: system-bottle

 jobs:  
-  call-loong64-tianlu:
-    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
-    secrets: inherit
-    with:
-      display-name: loong64-tianlu
-      arch: loong64
-      rootfs-codename: sid
-      rootfs-source: https://deb.debian.org/debian-ports/
-      gxde-codename: bixie
-      gxde-codename-upload: tianlu
-
  call-zhuangzhuang:
    uses: GXDE-OS/GXDE/.github/workflows/building-deb-zhuangzhuang.yml@master
    secrets: inherit
@@ -65,14 +65,3 @@ jobs:
      rootfs-source: https://deb.debian.org/debian/
      gxde-codename: bixie
      gxde-codename-upload: tianlu
-
-  call-loong64-tianlu:
-    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
-    secrets: inherit
-    with:
-      display-name: loong64-tianlu
-      arch: loong64
-      rootfs-codename: sid
-      rootfs-source: https://deb.debian.org/debian-ports/
-      gxde-codename: bixie
-      gxde-codename-upload: tianlu
@@ -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
@@ -1,4 +1,4 @@
-gxde (2025.06.11) UNRELEASED; urgency=medium
+gxde (2025.06.22) UNRELEASED; urgency=medium

  * 新增 remmina 以解决远程问题
  * 改为安装 dde-printer 
@@ -12,8 +12,10 @@ gxde (2025.06.11) UNRELEASED; urgency=medium
    gxde-session-ui、gxde-file-manager、gxde-desktop-panel
  * startdde=>startgxde
  * dde-kwin --> gxde-wm-shim
-  
- -- gfdgd_xi <3025613752@qq.com>  Mon, 09 Jun 2025 07:42:12 +0800
+  * 新增推荐依赖 gxde-desktop
+  * gxde-introduction 由 Depends 设置为 Recommends
+
+ -- gfdgd_xi <3025613752@qq.com>  Sun, 22 Jun 2025 09:59:58 +0800

 gxde (2024.10.20) UNRELEASED; urgency=medium

@@ -42,6 +42,7 @@ Recommends: ${misc:Depends},
 remmina,
 screensaver-pp,
 gxde-time-screensaver,
+ gxde-desktop,
 Description: GXDE New Desktop Environment Extra - Next
 This is a meta package depends GXDE New Desktop Envrionment Extra.
 .
@@ -106,10 +107,10 @@ Depends: ${misc:Depends},
 gxde-default-settings,
 gxde-shell-tools,
 gxde-compressor,
- gxde-introduction,
 Recommends:
 gxde-desktop-extra | gxde-desktop-android,
 gxde-editor,
+ gxde-introduction,
 pppoe,
 gvfs-fuse,
 smbclient,
Author	SHA1	Message	Date
gfdgd-xi	1e41f890a5	gxde-introduction 由 Depends 设置为 Recommends	2025-06-22 10:00:50 +08:00
gfdgd-xi	4e9d928ccc	修复设置tag后依旧只会构建默认分支的问题	2025-06-22 08:01:19 +08:00
gfdgd-xi	62bd578c8e	调整hetao自动构建源	2025-06-19 22:56:12 +08:00
gfdgd-xi	6d2bd7bbff	调整hetao apt源	2025-06-18 23:01:39 +08:00
gfdgd-xi	e1079908d9	停止tianlu-loong64构建	2025-06-18 22:36:44 +08:00
gfdgd-xi	b5ec9309fe	调整url	2025-06-17 22:28:36 +08:00
gfdgd-xi	d69d54ecd9	调整hetao	2025-06-16 22:27:19 +08:00
gfdgd-xi	52d131446c	新增推荐依赖gxde-desktop	2025-06-11 13:04:43 +08:00