新增推荐依赖gxde-kernel-manager、deepin-log-viewer

Signed-off-by: gfdgd_xi <3025613752@qq.com>

.github/workflows/building-deb-base.yml

@@ -47,6 +47,11 @@ on:
         description: 'Is build with backport'
         required: false
 
+      gxde-cross-arch:
+        type: string
+        description: 'Build deb to which arch'
+        required: false
+
       display-name:
         required: false
         type: string
@@ -89,20 +94,28 @@ 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 }}
         run: |
           gitPath=$(basename $GITHUB_REPOSITORY)
           if [[ -f system-bottle/$gitPath/debian/control ]]; then
-            env gitPath=$gitPath bash .github/workflows/run-command-in-chroot.sh env GXDE_CODENAME=${{ inputs.gxde-codename }} GO111MODULE=off dpkg-buildpackage -b
+            env gitPath=$gitPath bash .github/workflows/run-command-in-chroot.sh \
+              env GXDE_ARCH=${{ inputs.arch }} GXDE_CODENAME=${{ inputs.gxde-codename }} \
+              GXDE_ARCH=${{ inputs.arch }} GXDE_CROSS_ARCH=${{ inputs.gxde-cross-arch }} GO111MODULE=off \
+              dpkg-buildpackage -b
           else
-            env gitPath=$gitPath bash .github/workflows/run-command-in-chroot.sh env GXDE_CODENAME=${{ inputs.gxde-codename }} GO111MODULE=off bash build-deb.sh
+            env gitPath=$gitPath bash .github/workflows/run-command-in-chroot.sh \
+              env GXDE_ARCH=${{ inputs.arch }} GXDE_CODENAME=${{ inputs.gxde-codename }} \
+              GXDE_ARCH=${{ inputs.arch }} GXDE_CROSS_ARCH=${{ inputs.gxde-cross-arch }} GO111MODULE=off \
+              bash build-deb.sh
           fi
           cp $BOTTLEPATH/*.deb . -rv
           sudo rename 's/\.deb$/_${{ inputs.gxde-codename }}.deb/' *.deb

.github/workflows/building-deb-cross.yml

@@ -0,0 +1,35 @@
+name: Building GXDE Testing Package
+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-zhuangzhuang:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-zhuangzhuang-cross.yml@master
+    secrets: inherit
+  
+  call-hetao:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-hetao-cross.yml@master
+    secrets: inherit
+  
+  call-tianlu:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-tianlu-cross.yml@master
+    secrets: inherit

.github/workflows/building-deb-hetao-cross.yml

@@ -0,0 +1,71 @@
+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-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
+      gxde-cross-arch: amd64
+
+  call-arm64-hetao:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: arm64-hetao
+      arch: amd64
+      rootfs-codename: crimson
+      rootfs-source: https://mirrors.kernel.org/deepin/beige/
+      gxde-codename: hetao
+      gxde-codename-upload: hetao
+      gxde-cross-arch: arm64
+
+  call-loong64-hetao:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: loong64-hetao
+      arch: amd64
+      rootfs-codename: crimson
+      rootfs-source: https://mirrors.kernel.org/deepin/beige/
+      gxde-codename: hetao
+      gxde-codename-upload: hetao
+      gxde-cross-arch: loong64
+
+  call-riscv64-hetao:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: riscv64-hetao
+      arch: amd64
+      rootfs-codename: crimson
+      rootfs-source: https://mirrors.kernel.org/deepin/beige/
+      gxde-codename: hetao
+      gxde-codename-upload: hetao
+      gxde-cross-arch: riscv64

.github/workflows/building-deb-hetao.yml

@@ -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

.github/workflows/building-deb-sid.yml

@@ -21,18 +21,10 @@ env:
   REPOSITORY: https://github.com/GXDE-OS/GXDE  
   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
+jobs:
+  empty:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Empty
+        run: |
+          exit

.github/workflows/building-deb-tianlu-cross.yml

@@ -0,0 +1,72 @@
+name: Building GXDE Testing Package (tianlu)
+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-i386-tianlu:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: i386-tianlu
+      arch: i386
+      rootfs-codename: bookworm
+      rootfs-source: https://deb.debian.org/debian/
+      gxde-codename: bixie
+      gxde-codename-upload: tianlu
+      gxde-cross-arch: i386
+      
+
+  call-amd64-tianlu:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: amd64-tianlu
+      arch: amd64
+      rootfs-codename: bookworm
+      rootfs-source: https://deb.debian.org/debian/
+      gxde-codename: bixie
+      gxde-codename-upload: tianlu
+      gxde-cross-arch: amd64
+
+  call-arm64-tianlu:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: arm64-tianlu
+      arch: amd64
+      rootfs-codename: bookworm
+      rootfs-source: https://deb.debian.org/debian/
+      gxde-codename: bixie
+      gxde-codename-upload: tianlu
+      gxde-cross-arch: arm64
+
+  call-mips64el-tianlu:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: mips64el-tianlu
+      arch: amd64
+      rootfs-codename: bookworm
+      rootfs-source: https://deb.debian.org/debian/
+      gxde-codename: bixie
+      gxde-codename-upload: tianlu
+      gxde-cross-arch: mips64el

.github/workflows/building-deb-tianlu.yml

@@ -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

.github/workflows/building-deb-zhuangzhuang-cross.yml

@@ -0,0 +1,60 @@
+name: Building GXDE Testing Package (zhuangzhuang)
+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-amd64-zhuangzhuang:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: amd64-zhuangzhuang
+      arch: amd64
+      rootfs-codename: trixie
+      rootfs-source: https://deb.debian.org/debian/
+      gxde-codename: lizhi
+      gxde-codename-upload: zhuangzhuang
+      gxde-cross-arch: amd64
+
+  call-arm64-zhuangzhuang:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: arm64-zhuangzhuang
+      arch: amd64
+      rootfs-codename: trixie
+      rootfs-source: https://deb.debian.org/debian/
+      gxde-codename: lizhi
+      gxde-codename-upload: zhuangzhuang
+      gxde-cross-arch: arm64
+
+
+  call-riscv64-zhuangzhuang:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: riscv64-zhuangzhuang
+      arch: amd64
+      rootfs-codename: trixie
+      rootfs-source: https://deb.debian.org/debian/
+      gxde-codename: lizhi
+      gxde-codename-upload: zhuangzhuang
+      gxde-cross-arch: riscv64

.github/workflows/building-deb-zhuangzhuang.yml

@@ -22,17 +22,6 @@ env:
   BOTTLEPATH: system-bottle
 
 jobs:  
-  call-i386-zhuangzhuang:
-    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
-    secrets: inherit
-    with:
-      display-name: i386-zhuangzhuang
-      arch: i386
-      rootfs-codename: trixie
-      rootfs-source: https://deb.debian.org/debian/
-      gxde-codename: lizhi
-      gxde-codename-upload: zhuangzhuang
-
   call-amd64-zhuangzhuang:
     uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
     secrets: inherit

.github/workflows/building-deb.yml

@@ -32,25 +32,4 @@ jobs:
   
   call-tianlu:
     uses: GXDE-OS/GXDE/.github/workflows/building-deb-tianlu.yml@master
-    secrets: inherit
-
-  UploadOBS:
-    if: github.repository_owner == 'GXDE-OS'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get REPOSITORY Name
-        run: |
-          echo "REPO_NAME=$(echo "$GITHUB_REPOSITORY" | cut -d'/' -f2)" >> $GITHUB_ENV
-          REPO_NAME=$(echo "$GITHUB_REPOSITORY" | cut -d'/' -f2)
-          mkdir /home/runner/work/$REPO_NAME/$REPO_NAME/debian-deb-output
-
-      - name: Upload to OBS
-        uses: LingmoOS/action-upload-to-obs@0.0.4
-        with:
-          remove-old-sources: true
-          obs-package-name: ${{ env.REPO_NAME }}
-          obs-project-name: 'home:gfdgd-xi'
-          obs-user-name: ${{ secrets.OBS_USERNAME }}
-          obs-password: ${{ secrets.OBS_PASSWORD }}
-          obs-instance-url: 'https://api.opensuse.org'
-          local-package-dir: './debian-deb-output'
+    secrets: inherit

.github/workflows/configure-building-enviroment-base-system.sh

@@ -56,11 +56,11 @@ 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/
-    echo "deb [trusted=true] https://repo.gxde.org/gxde-os/tianlu-bpo ./" >> $bottlePath/etc/apt/sources.list.d/gxde-os-bpo.list
+    echo "deb [trusted=true] https://repo.gxde.top/gxde-os/tianlu-bpo ./" >> $bottlePath/etc/apt/sources.list.d/gxde-os-bpo.list
 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
@@ -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

.github/workflows/configure-building-enviroment.sh

@@ -20,13 +20,13 @@ export DEBIAN_FRONTEND=noninteractive  # 防止卡 tzdate
 
 
 if [[ $1 == "" ]] || [[ $1 == "tianlu" ]]; then
-    echo "deb [trusted=true] https://repo.gxde.org/gxde-os/tianlu ./" >> /etc/apt/sources.list.d/gxde-os.list
-    echo "deb [trusted=true] https://repo.gxde.org/gxde-os/bixie ./" >> /etc/apt/sources.list.d/gxde-os.list
+    echo "deb [trusted=true] https://repo.gxde.top/gxde-os/tianlu ./" >> /etc/apt/sources.list.d/gxde-os.list
+    echo "deb [trusted=true] https://repo.gxde.top/gxde-os/bixie ./" >> /etc/apt/sources.list.d/gxde-os.list
 elif [[ $1 == "zhuangzhuang" ]];then
-    echo "deb [trusted=true] https://repo.gxde.org/gxde-os/zhuangzhuang ./" >> /etc/apt/sources.list.d/gxde-os.list
-    echo "deb [trusted=true] https://repo.gxde.org/gxde-os/lizhi ./" >> /etc/apt/sources.list.d/gxde-os.list
+    echo "deb [trusted=true] https://repo.gxde.top/gxde-os/zhuangzhuang ./" >> /etc/apt/sources.list.d/gxde-os.list
+    echo "deb [trusted=true] https://repo.gxde.top/gxde-os/lizhi ./" >> /etc/apt/sources.list.d/gxde-os.list
 else
-    echo "deb [trusted=true] https://repo.gxde.org/gxde-os/$1 ./" >> /etc/apt/sources.list.d/gxde-os.list
+    echo "deb [trusted=true] https://repo.gxde.top/gxde-os/$1 ./" >> /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
@@ -61,6 +61,7 @@ apt install dpkg-dev sudo debian-ports-archive-keyring debian-archive-keyring de
 # 解包 gxde-desktop-base
 apt download gxde-desktop-base
 dpkg -x gxde-desktop-base_*.deb /
+rm gxde-desktop-base_*.deb -rfv
 if [[ -f /etc/apt/sources.list.d/debian-backports.list ]]; then
     dch --bpo ""
     sed -i "s/~bpo/-bpo/g" debian/changelog

debian/changelog

@@ -1,4 +1,4 @@
-gxde (2025.06.11-1) UNRELEASED; urgency=medium
+gxde (2025.08.29gxde1) UNRELEASED; urgency=medium
 
   * 新增 remmina 以解决远程问题
   * 改为安装 dde-printer 
@@ -13,8 +13,12 @@ gxde (2025.06.11-1) UNRELEASED; urgency=medium
   * startdde=>startgxde
   * dde-kwin --> gxde-wm-shim
   * 新增推荐依赖 gxde-desktop
+  * gxde-introduction 由 Depends 设置为 Recommends
+  * 推荐安装 apt-is-aptss 
+  * 新增推荐依赖 bash-pinyin-completion
+  * 新增推荐依赖gxde-kernel-manager、deepin-log-viewer
 
- -- gfdgd_xi <3025613752@qq.com>  Wed, 11 Jun 2025 13:04:09 +0800
+ -- gfdgd_xi <3025613752@qq.com>  Fri, 29 Aug 2025 23:15:19 +0800
 
 gxde (2024.10.20) UNRELEASED; urgency=medium
 

debian/control

@@ -26,7 +26,6 @@ Recommends: ${misc:Depends},
  gxde-sendbylan,
  gxde-dict,
  gxde-system-assistant,
- spark-store | aptss,
  loongsonapplication,
  gxde-boot-maker,
  deepin-clone,
@@ -43,6 +42,9 @@ Recommends: ${misc:Depends},
  screensaver-pp,
  gxde-time-screensaver,
  gxde-desktop,
+ bash-pinyin-completion,
+ gxde-kernel-manager,
+ deepin-log-viewer,
 Description: GXDE New Desktop Environment Extra - Next
  This is a meta package depends GXDE New Desktop Envrionment Extra.
  .
@@ -67,6 +69,7 @@ Depends:
  deepin-system-monitor,
  gxde-control-center,
  gxde-file-manager,
+ spark-store | aptss,
 Conflicts:
  plymouth-theme-gxde-logo,
  linux-kernel-gxde-i386,
@@ -107,10 +110,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,
@@ -158,6 +161,7 @@ Recommends:
  fcitx5-table,
  fantascene-dynamic-wallpaper,
  x11vnc,
+ apt-is-aptss,
 Conflicts:
  deepin-desktop-environment-desktop,
  deepin-desktop-environment-dock,