gxde-introduction 由 Depends 设置为 Recommends

Signed-off-by: shenmo <jifengshenmo@outlook.com>

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

@@ -22,231 +22,6 @@ env:
   BOTTLEPATH: system-bottle
 
 jobs:  
-  i386:
+  call-tianlu:
-    runs-on: ubuntu-latest
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-tianlu-backport.yml@master
-    steps:
+    secrets: inherit
-      - name: Clone Repository To Get Script
-        run: |
-          git clone $REPOSITORY --depth=1
-          mv $(basename $REPOSITORY)/* . -v
-          mv $(basename $REPOSITORY)/.* . -v | true
-
-      - name: Configure Base System
-        run: |
-          bash .github/workflows/configure-building-enviroment-base-system.sh i386 bookworm $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian/ backport
-
-      - name: Building ${{ GITHUB.repository }}
-        run: |
-          env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh env GXDE_CODENAME=bixie GO111MODULE=off dpkg-buildpackage -b
-          cp $BOTTLEPATH/*.deb . -rv
-
-      - name: Remove Debug Package
-        run: |
-          cd $BOTTLEPATH
-          echo -e "ls -1 | grep dbgsym | grep .deb | grep -v dtk | grep -v qt | grep -v dock | grep -v gxtk\nexit 0" | sudo tee remove-deb.sh
-          removeDeb=$(bash remove-deb.sh)
-          sudo rm -rf $removeDeb
-
-      - name: Pack tar
-        run: |
-          cd $BOTTLEPATH
-          sudo tar -cvf ../deb-$(date +%s).tar *.deb 
-
-      - name: Push
-        env: 
-          UPASSWD: ${{ secrets.PASSWD }}
-          UUSERS: ${{ secrets.USERS }}
-          UHOST: ${{ secrets.HOST }}
-          UPATH: ${{ secrets.UPATH }}
-          UPROGRAM: ${{ secrets.UPROGRAM }}
-          UPORT: ${{ secrets.UPORT }}
-        run: |
-          sudo apt update
-          sudo apt install sshpass -y
-          mkdir -p ~/.ssh/
-          ssh-keyscan -p $UPORT -H $UHOST >> ~/.ssh/known_hosts
-          tarName=$(ls | grep .tar | head -n 1)
-          sshpass -p "$UPASSWD" rsync -e "ssh -p $UPORT" $tarName $UUSERS@$UHOST:$UPATH
-          sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM tianlu-bpo $UPATH/$tarName > /dev/null
-
-      - name: Create Release
-        uses: softprops/action-gh-release@v1
-        if: startsWith(github.ref, 'refs/tags/')
-        env:
-          GITHUB_TOKEN: ${{ secrets.RELEASE_TOCKEN_GITHUB }}
-        with:
-          files: |
-            *.deb
-          generate_release_notes: true
-
-  amd64:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Clone Repository To Get Script
-        run: |
-          git clone $REPOSITORY --depth=1
-          mv $(basename $REPOSITORY)/* . -v
-          mv $(basename $REPOSITORY)/.* . -v | true
-
-      - name: Configure Base System
-        run: |
-          bash .github/workflows/configure-building-enviroment-base-system.sh amd64 bookworm $REPOSITORY https://github.com/$GITHUB_REPOSITORY  https://deb.debian.org/debian/ backport
-
-      - name: Building ${{ GITHUB.repository }}
-        run: |
-          env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh env GXDE_CODENAME=bixie GO111MODULE=off dpkg-buildpackage -b
-          cp $BOTTLEPATH/*.deb . -rv
-
-      - name: Remove Debug Package
-        run: |
-          cd $BOTTLEPATH
-          echo -e "ls -1 | grep dbgsym | grep .deb | grep -v dtk | grep -v qt | grep -v dock | grep -v gxtk\nexit 0" | sudo tee remove-deb.sh
-          removeDeb=$(bash remove-deb.sh)
-          sudo rm -rf $removeDeb
-
-      - name: Pack tar
-        run: |
-          cd $BOTTLEPATH
-          sudo tar -cvf ../deb-$(date +%s).tar *.deb 
-
-      - name: Push
-        env: 
-          UPASSWD: ${{ secrets.PASSWD }}
-          UUSERS: ${{ secrets.USERS }}
-          UHOST: ${{ secrets.HOST }}
-          UPATH: ${{ secrets.UPATH }}
-          UPROGRAM: ${{ secrets.UPROGRAM }}
-          UPORT: ${{ secrets.UPORT }}
-        run: |
-          sudo apt update
-          sudo apt install sshpass -y
-          mkdir -p ~/.ssh/
-          ssh-keyscan -p $UPORT -H $UHOST >> ~/.ssh/known_hosts
-          tarName=$(ls | grep .tar | head -n 1)
-          sshpass -p "$UPASSWD" rsync -e "ssh -p $UPORT" $tarName $UUSERS@$UHOST:$UPATH
-          sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM tianlu-bpo $UPATH/$tarName > /dev/null
-
-      - name: Create Release
-        uses: softprops/action-gh-release@v1
-        if: startsWith(github.ref, 'refs/tags/')
-        env:
-          GITHUB_TOKEN: ${{ secrets.RELEASE_TOCKEN_GITHUB }}
-        with:
-          files: |
-            *.deb
-          generate_release_notes: true
-
-  arm64:
-    runs-on: ubuntu-24.04
-    #runs-on: self-hosted
-    steps:
-      - name: Clone Repository To Get Script
-        run: |
-          git clone $REPOSITORY --depth=1
-          mv $(basename $REPOSITORY)/* . -v
-          mv $(basename $REPOSITORY)/.* . -v | true
-
-      - name: Configure Base System
-        run: |
-          bash .github/workflows/configure-building-enviroment-base-system.sh arm64 bookworm $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian/ backport
-
-      - name: Building ${{ GITHUB.repository }}
-        run: |
-          env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh env GXDE_CODENAME=bixie GO111MODULE=off dpkg-buildpackage -b
-          cp $BOTTLEPATH/*.deb . -rv
-
-      - name: Remove Debug Package
-        run: |
-          cd $BOTTLEPATH
-          echo -e "ls -1 | grep dbgsym | grep .deb | grep -v dtk | grep -v qt | grep -v dock | grep -v gxtk\nexit 0" | sudo tee remove-deb.sh
-          removeDeb=$(bash remove-deb.sh)
-          sudo rm -rf $removeDeb
-
-      - name: Pack tar
-        run: |
-          cd $BOTTLEPATH
-          sudo tar -cvf ../deb-$(date +%s).tar *.deb 
-
-      - name: Push
-        env: 
-          UPASSWD: ${{ secrets.PASSWD }}
-          UUSERS: ${{ secrets.USERS }}
-          UHOST: ${{ secrets.HOST }}
-          UPATH: ${{ secrets.UPATH }}
-          UPROGRAM: ${{ secrets.UPROGRAM }}
-          UPORT: ${{ secrets.UPORT }}
-        run: |
-          sudo apt update
-          sudo apt install sshpass -y
-          mkdir -p ~/.ssh/
-          ssh-keyscan -p $UPORT -H $UHOST >> ~/.ssh/known_hosts
-          tarName=$(ls | grep .tar | head -n 1)
-          sshpass -p "$UPASSWD" rsync -e "ssh -p $UPORT" $tarName $UUSERS@$UHOST:$UPATH
-          sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM tianlu-bpo $UPATH/$tarName > /dev/null
-  
-      - name: Create Release
-        uses: softprops/action-gh-release@v1
-        if: startsWith(github.ref, 'refs/tags/')
-        env:
-          GITHUB_TOKEN: ${{ secrets.RELEASE_TOCKEN_GITHUB }}
-        with:
-          files: |
-            *.deb
-          generate_release_notes: true
-
-  mips64:
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Clone Repository To Get Script
-        run: |
-          git clone $REPOSITORY --depth=1
-          mv $(basename $REPOSITORY)/* . -v
-          mv $(basename $REPOSITORY)/.* . -v | true
-
-      - name: Configure Base System
-        run: |
-          bash .github/workflows/configure-building-enviroment-base-system.sh mips64el bookworm $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian/ backport
-
-      - name: Building ${{ GITHUB.repository }}
-        run: |
-          env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh env GXDE_CODENAME=bixie GO111MODULE=off dpkg-buildpackage -b
-          cp $BOTTLEPATH/*.deb . -rv
-
-      - name: Remove Debug Package
-        run: |
-          cd $BOTTLEPATH
-          echo -e "ls -1 | grep dbgsym | grep .deb | grep -v dtk | grep -v qt | grep -v dock | grep -v gxtk\nexit 0" | sudo tee remove-deb.sh
-          removeDeb=$(bash remove-deb.sh)
-          sudo rm -rf $removeDeb
-
-      - name: Pack tar
-        run: |
-          cd $BOTTLEPATH
-          sudo tar -cvf ../deb-$(date +%s).tar *.deb 
-
-      - name: Push
-        env: 
-          UPASSWD: ${{ secrets.PASSWD }}
-          UUSERS: ${{ secrets.USERS }}
-          UHOST: ${{ secrets.HOST }}
-          UPATH: ${{ secrets.UPATH }}
-          UPROGRAM: ${{ secrets.UPROGRAM }}
-          UPORT: ${{ secrets.UPORT }}
-        run: |
-          sudo apt update
-          sudo apt install sshpass -y
-          mkdir -p ~/.ssh/
-          ssh-keyscan -p $UPORT -H $UHOST >> ~/.ssh/known_hosts
-          tarName=$(ls | grep .tar | head -n 1)
-          sshpass -p "$UPASSWD" rsync -e "ssh -p $UPORT" $tarName $UUSERS@$UHOST:$UPATH
-          sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM tianlu-bpo $UPATH/$tarName > /dev/null
-
-      - name: Create Release
-        uses: softprops/action-gh-release@v1
-        if: startsWith(github.ref, 'refs/tags/')
-        env:
-          GITHUB_TOKEN: ${{ secrets.RELEASE_TOCKEN_GITHUB }}
-        with:
-          files: |
-            *.deb
-          generate_release_notes: true

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

@@ -42,6 +42,11 @@ on:
         description: 'GXDE OS Codename'
         required: true
 
+      gxde-is-backport:
+        type: boolean
+        description: 'Is build with backport'
+        required: false
+
       display-name:
         required: false
         type: string
@@ -54,6 +59,7 @@ env:
 
 jobs:  
   build:
+    if: github.repository_owner == 'GXDE-OS'
     name: ${{ inputs.display-name || 'Build Job' }}
     runs-on: ubuntu-24.04
     steps:
@@ -80,11 +86,17 @@ jobs:
 
       - name: Configure Base System
         run: |
+          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 }}
+            ${{ inputs.rootfs-source }} \
+            ${{ github.ref_name }} \
+            $isBackport
 
       - name: Building ${{ GITHUB.repository }}
         run: |
@@ -103,6 +115,9 @@ jobs:
           echo -e "ls -1 | grep dbgsym | grep .deb | grep -v dtk | grep -v qt | grep -v dock | grep -v gxtk\nexit 0" | sudo tee remove-deb.sh
           removeDeb=$(bash remove-deb.sh)
           sudo rm -rf $removeDeb
+          echo -e "ls -1 | grep dbg_ | grep .deb | grep -v dtk | grep -v qt | grep -v dock | grep -v gxtk\nexit 0" | sudo tee remove-deb.sh
+          removeDeb=$(bash remove-deb.sh)
+          sudo rm -rf $removeDeb
 
       - name: Pack tar
         run: |
@@ -134,4 +149,4 @@ jobs:
         with:
           files: |
             *.deb
-          generate_release_notes: true
+          generate_release_notes: true

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

@@ -0,0 +1,67 @@
+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
+
+  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
+    with:
+      display-name: loong64-hetao
+      arch: loong64
+      rootfs-codename: crimson
+      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-newest.yml

@@ -0,0 +1,42 @@
+name: Building GXDE Package for Newest Release
+run-name: Building for Newest Release ${{ 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-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
+
+  call-hetao:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-hetao.yml@master
+    secrets: inherit

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

@@ -22,136 +22,6 @@ env:
   BOTTLEPATH: system-bottle
 
 jobs:  
-  call:
+  call-zhuangzhuang:
     uses: GXDE-OS/GXDE/.github/workflows/building-deb-zhuangzhuang.yml@master
-    secrets: inherit
+    secrets: inherit
-
-  loong64:
-    runs-on: ubuntu-24.04
-    steps:
-      # 由于默认的 Ubuntu 环境只有 17G 左右的剩余空间，所以我们需要先利用如下 action 对编译环境进行扩容
-      - name: Maximize build space
-        uses: easimon/maximize-build-space@master
-        with:
-          # 这个值是保留给系统的空间大小，之前设置太小，总会在安装依赖或者编译过程中报设备空间不足的错误而导致编译失败
-          root-reserve-mb: 4096
-          swap-size-mb: 512
-          remove-dotnet: 'true'
-          remove-docker-images: 'true'
-          remove-codeql: 'true'
-          remove-haskell: 'true'
-          remove-android: 'true'
-
-      - name: Clone Repository To Get Script
-        run: |
-          #apt update
-          #apt install sudo git -y
-          git clone $REPOSITORY --depth=1
-          mv $(basename $REPOSITORY)/* . -v
-          mv $(basename $REPOSITORY)/.* . -v | true
-
-      - name: Configure Base System
-        run: |
-          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: |
-          env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh env GXDE_CODENAME=bixie GO111MODULE=off dpkg-buildpackage -b
-
-      - name: Remove Debug Package
-        run: |
-          cd $BOTTLEPATH
-          echo -e "ls -1 | grep dbgsym | grep .deb | grep -v dtk | grep -v qt | grep -v dock | grep -v gxtk\nexit 0" | sudo tee remove-deb.sh
-          removeDeb=$(bash remove-deb.sh)
-          sudo rm -rf $removeDeb
-
-      - name: Pack tar
-        run: |
-          cd $BOTTLEPATH
-          sudo tar -cvf ../deb-$(date +%s).tar *.deb 
-
-      - name: Push
-        env: 
-          UPASSWD: ${{ secrets.PASSWD }}
-          UUSERS: ${{ secrets.USERS }}
-          UHOST: ${{ secrets.HOST }}
-          UPATH: ${{ secrets.UPATH }}
-          UPROGRAM: ${{ secrets.UPROGRAM }}
-          UPORT: ${{ secrets.UPORT }}
-        run: |
-          sudo apt update
-          sudo apt install sshpass -y
-          mkdir -p ~/.ssh/
-          ssh-keyscan -p $UPORT -H $UHOST >> ~/.ssh/known_hosts
-          tarName=$(ls | grep .tar | head -n 1)
-          sshpass -p "$UPASSWD" rsync -e "ssh -p $UPORT" $tarName $UUSERS@$UHOST:$UPATH
-          sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM tianlu $UPATH/$tarName > /dev/null
-
-  riscv64:
-    runs-on: ubuntu-24.04
-    steps:
-      # 由于默认的 Ubuntu 环境只有 17G 左右的剩余空间，所以我们需要先利用如下 action 对编译环境进行扩容
-      - name: Maximize build space
-        uses: easimon/maximize-build-space@master
-        with:
-          # 这个值是保留给系统的空间大小，之前设置太小，总会在安装依赖或者编译过程中报设备空间不足的错误而导致编译失败
-          root-reserve-mb: 4096
-          swap-size-mb: 512
-          remove-dotnet: 'true'
-          remove-docker-images: 'true'
-          remove-codeql: 'true'
-          remove-haskell: 'true'
-          remove-android: 'true'
-          
-      - name: Clone Repository To Get Script
-        run: |
-          #apt update
-          #apt install sudo git -y
-          git clone $REPOSITORY --depth=1
-          mv $(basename $REPOSITORY)/* . -v
-          mv $(basename $REPOSITORY)/.* . -v | true
-
-      - name: Configure Base System
-        run: |
-          bash .github/workflows/configure-building-enviroment-base-system.sh riscv64 sid $REPOSITORY https://github.com/$GITHUB_REPOSITORY 
-
-      - name: Building ${{ GITHUB.repository }}
-        run: |
-          set +e
-          env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh env GXDE_CODENAME=bixie GO111MODULE=off dpkg-buildpackage -b 
-
-      - name: Remove Debug Package
-        run: |
-          set +e
-          cd $BOTTLEPATH
-          echo -e "ls -1 | grep dbgsym | grep .deb | grep -v dtk | grep -v qt | grep -v dock | grep -v gxtk\nexit 0" | sudo tee remove-deb.sh
-          removeDeb=$(bash remove-deb.sh)
-          sudo rm -rf $removeDeb 
-
-      - name: Pack tar
-        run: |
-          set +e
-          cd $BOTTLEPATH
-          sudo tar -cvf ../deb-$(date +%s).tar *.deb
-
-      - name: Push
-        env: 
-          UPASSWD: ${{ secrets.PASSWD }}
-          UUSERS: ${{ secrets.USERS }}
-          UHOST: ${{ secrets.HOST }}
-          UPATH: ${{ secrets.UPATH }}
-          UPROGRAM: ${{ secrets.UPROGRAM }}
-          UPORT: ${{ secrets.UPORT }}
-        run: |
-          set +e
-          sudo apt update
-          sudo apt install sshpass -y
-          mkdir -p ~/.ssh/
-          ssh-keyscan -p $UPORT -H $UHOST >> ~/.ssh/known_hosts
-          tarName=$(ls | grep .tar | head -n 1)
-          if [[ $tarName != "" ]]; then
-            sshpass -p "$UPASSWD" rsync -e "ssh -p $UPORT" $tarName $UUSERS@$UHOST:$UPATH > /dev/null
-            sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM tianlu $UPATH/$tarName > /dev/null
-          fi
-

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

@@ -0,0 +1,96 @@
+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-bpo
+      gxde-is-backport: true
+
+  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-bpo
+      gxde-is-backport: true
+
+  call-arm64-tianlu:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: arm64-tianlu
+      arch: arm64
+      rootfs-codename: bookworm
+      rootfs-source: https://deb.debian.org/debian/
+      gxde-codename: bixie
+      gxde-codename-upload: tianlu-bpo
+      gxde-is-backport: true
+
+  call-mips64el-tianlu:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: mips64el-tianlu
+      arch: mips64el
+      rootfs-codename: bookworm
+      rootfs-source: https://deb.debian.org/debian/
+      gxde-codename: bixie
+      gxde-codename-upload: tianlu-bpo
+      gxde-is-backport: true
+
+
+  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
+      gxde-is-backport: true
+
+  call-riscv64-tianlu:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: riscv64-tianlu
+      arch: riscv64
+      rootfs-codename: sid
+      rootfs-source: https://deb.debian.org/debian/
+      gxde-codename: bixie
+      gxde-codename-upload: tianlu
+      gxde-is-backport: true

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

@@ -65,25 +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
-
-  call-riscv64-tianlu:
-    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
-    secrets: inherit
-    with:
-      display-name: riscv64-tianlu
-      arch: riscv64
-      rootfs-codename: sid
-      rootfs-source: https://deb.debian.org/debian/
-      gxde-codename: bixie
-      gxde-codename-upload: tianlu

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

@@ -22,6 +22,17 @@ 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
@@ -44,16 +55,7 @@ jobs:
       gxde-codename: lizhi
       gxde-codename-upload: zhuangzhuang
 
-  call-mips64el-zhuangzhuang:
+
-    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
-    secrets: inherit
-    with:
-      display-name: mips64el-zhuangzhuang
-      arch: mips64el
-      rootfs-codename: trixie
-      rootfs-source: https://deb.debian.org/debian/
-      gxde-codename: lizhi
-      gxde-codename-upload: zhuangzhuang
 
   call-riscv64-zhuangzhuang:
     uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master

.github/workflows/building-deb.yml

@@ -26,10 +26,31 @@ jobs:
     uses: GXDE-OS/GXDE/.github/workflows/building-deb-zhuangzhuang.yml@master
     secrets: inherit
   
-  call-meimei:
+  call-hetao:
-    uses: GXDE-OS/GXDE/.github/workflows/building-deb-meimei.yml@master
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-hetao.yml@master
     secrets: inherit
   
   call-tianlu:
     uses: GXDE-OS/GXDE/.github/workflows/building-deb-tianlu.yml@master
-    secrets: inherit
+    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'

.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,16 @@ else
         useLoongnix
     fi
 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
+    useDeepin25
+    sudo debootstrap --no-check-gpg --include=git,deepin-keyring,gcc,make,g++,dpkg-dev,qtbase5-dev,ca-certificates --arch=$1 $2 $bottlePath $5
+else
+    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
+fi
+
+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
@@ -44,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/
@@ -56,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
@@ -67,6 +79,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
     ;;

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

@@ -22,6 +22,9 @@ 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
+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
 else
     echo "deb [trusted=true] https://repo.gxde.org/gxde-os/$1 ./" >> /etc/apt/sources.list.d/gxde-os.list
 fi
@@ -38,7 +41,7 @@ do
     fi
     sleep 1
 done
-apt install dpkg-dev sudo debian-ports-archive-keyring debian-archive-keyring -y
+apt install dpkg-dev sudo debian-ports-archive-keyring debian-archive-keyring devscripts -y
 #neofetch
 #if [[ `arch` != "x86_64" ]]; then
 #    apt source qemu
@@ -55,10 +58,13 @@ apt install dpkg-dev sudo debian-ports-archive-keyring debian-archive-keyring -y
 #apt build-dep qemu -y
 # 如果是 Debian10 就需要安装 Python3 的依赖
 #apt build-dep python3.7 -y
-# 解包 deepin-desktop-base
+# 解包 gxde-desktop-base
-apt download deepin-desktop-base
+apt download gxde-desktop-base
-dpkg -x deepin-desktop-base_*.deb /
+dpkg -x gxde-desktop-base_*.deb /
-    
+if [[ -f /etc/apt/sources.list.d/debian-backports.list ]]; then
+    dch --bpo ""
+    sed -i "s/~bpo/-bpo/g" debian/changelog
+fi
 for i in {1..5};
 do
     apt build-dep . -y

.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

.github/workflows/debian-backports.list

@@ -1,2 +1,2 @@
-deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm-backports main contrib non-free non-free-firmware
+deb https://deb.debian.org/debian/ bookworm-backports main contrib non-free non-free-firmware
-# deb-src https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm-backports main contrib non-free non-free-firmware
+# deb-src https://deb.debian.org/debian/ bookworm-backports main contrib non-free non-free-firmware

MAINTAINERS

@@ -1,8 +1,9 @@
 This file contains honored contributers of GXDE and GXDE OS. The list is in alphabetical order. 
 
+dependon <liuminghang0821@gmail.com>
 elysia <c.elysia@foxmail.com>
 gfdgd xi <3025613752@qq.com>
 qingyu <qingyuqingyu123@proton.me>
 shenmo <shenmo@spark-app.store>
 yoyo <chowhound_xb@163.com>
-zinface <zinface@163.com>
+zinface <zinface@163.com>

README.md

@@ -39,17 +39,17 @@ Discord: https://discord.gg/t5Uf2xYpvA
 > Currently, ISO supports amd64, arm64
 
 
-Please check https://www.gxde.org/en/install/
+Please check https://www.gxde.top/en/install/
 
-![1](https://www.gxde.org/1.png)
+![1](https://www.gxde.top/1.jpg)
 
-![2](https://www.gxde.org/2.png)
+![2](https://www.gxde.top/2.jpg)
 
-![3](https://www.gxde.org/3.png)
+![3](https://www.gxde.top/3.jpg)
 
-![4](https://www.gxde.org/4.png)
+![4](https://www.gxde.top/4.jpg)
 
-![5](https://www.gxde.org/5.png)
+![5](https://www.gxde.top/5.jpg)
 
 
 ## Other Projects
@@ -75,9 +75,8 @@ Gitee: http://gitee.com/GXDE-OS
 Github: http://github.com/GXDE-OS  
 Gitcode: https://gitcode.com/GXDE-OS  
 
-## Buy a Cup of Tea for the Author
+## Donate
-If you find it helpful, you can buy the author a cup of tea.  
+https://donate.deepinos.org.cn/donate/index.html#
-<img src="Icon/QR/Wechat.png" width="250" />
 
 ### Advertisement
 Scan to receive a payment red envelope from the Alipay official event!  

README.zh.md

@@ -2,6 +2,8 @@
 <hr>
 <a href='https://gitee.com/GXDE-OS/GXDE/stargazers'><img src='https://gitee.com/GXDE-OS/GXDE/badge/star.svg?theme=dark' alt='star'></img></a>
 
+![G-Start](https://gitcode.com/GXDE-OS/GXDE/star/badge.svg)  
+
 
 **[English](/README.md)**
 
@@ -37,17 +39,17 @@ Discord：https://discord.gg/t5Uf2xYpvA
 
 ## 安装
 
-请查看 https://www.gxde.org/install/install
+请查看 https://www.gxde.top/install/install
 
-![1](https://www.gxde.org/1.png)
+![1](https://www.gxde.top/1.jpg)
 
-![2](https://www.gxde.org/2.png)
+![2](https://www.gxde.top/2.jpg)
 
-![3](https://www.gxde.org/3.png)
+![3](https://www.gxde.top/3.jpg)
 
-![4](https://www.gxde.org/4.png)
+![4](https://www.gxde.top/4.jpg)
 
-![5](https://www.gxde.org/5.png)
+![5](https://www.gxde.top/5.jpg)
 
 
 ## 其它项目
@@ -72,9 +74,8 @@ Gitee：http://gitee.com/GXDE-OS
 Github：http://github.com/GXDE-OS  
 Gitcode：https://gitcode.com/GXDE-OS  
 
-## 请作者喝杯茶
+## 捐赠
-如果您觉得对你有帮助，可以请作者喝杯茶  
+https://donate.deepinos.org.cn/donate/index.html#
-<img src="Icon/QR/Wechat.png" width="250"  /> 
 
 ### 广告
 支付宝官方活动，扫描获得支付红包！  

debian/changelog

@@ -1,9 +1,21 @@
-gxde (2025.03.09) UNRELEASED; urgency=medium
+gxde (2025.06.22) UNRELEASED; urgency=medium
 
   * 新增 remmina 以解决远程问题
   * 改为安装 dde-printer 
+  * 新增屏保
+  * 修复安装 gxde-desktop-android 会自动安装 gxde-desktop-extra 的问题
+  * 新增推荐依赖：龙芯应用合作社（仅限：mips64el loongarch64 loong64）
+  * 移除推荐依赖：plank
+  * 修复小小电脑无法正常更新 gxde-desktop-android 的问题
+  * 修改 dde-control-center、dde-launcher、dde-dock、deepin-desktop-base 为 gxde-control-center、gxde-launcher、gxde-dock、gxde-desktop-base
+  * 修改 dde-session-ui、dde-file-manager、dde-desktop 为
+    gxde-session-ui、gxde-file-manager、gxde-desktop-panel
+  * startdde=>startgxde
+  * dde-kwin --> gxde-wm-shim
+  * 新增推荐依赖 gxde-desktop
+  * gxde-introduction 由 Depends 设置为 Recommends
 
- -- gfdgd_xi <3025613752@qq.com>  Mon, 10 Feb 2025 17:14:15 +0800
+ -- gfdgd_xi <3025613752@qq.com>  Sun, 22 Jun 2025 09:59:58 +0800
 
 gxde (2024.10.20) UNRELEASED; urgency=medium
 

debian/control

@@ -27,6 +27,7 @@ Recommends: ${misc:Depends},
  gxde-dict,
  gxde-system-assistant,
  spark-store | aptss,
+ loongsonapplication,
  gxde-boot-maker,
  deepin-clone,
  dde-printer | system-config-printer,
@@ -37,8 +38,11 @@ Recommends: ${misc:Depends},
  x11vnc,
  com.github.minesweep,
  2048-qt,
- papirus-icon-theme,
+ papirus-icon-theme | gxde-desktop-android,
- remmina
+ 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.
  .
@@ -50,7 +54,6 @@ Depends:
  ${misc:Depends},
  gxde-daemon,
  gxde-desktop,
- gxde-calculator, 
  gxde-terminal, 
  gxde-deb-installer, 
  gxde-editor, 
@@ -62,8 +65,8 @@ Depends:
  gxde-quick-hash, 
  spark-store | aptss, 
  deepin-system-monitor,
- dde-control-center,
+ gxde-control-center,
- dde-file-manager,
+ gxde-file-manager,
 Conflicts:
  plymouth-theme-gxde-logo,
  linux-kernel-gxde-i386,
@@ -86,28 +89,28 @@ Description: GXDE New Desktop Environment For PRoot - Next
 Package: gxde-desktop
 Architecture: all
 Depends: ${misc:Depends},
- deepin-desktop-base,
+ gxde-desktop-base,
- dde-desktop,
+ gxde-desktop-panel,
- dde-dock,
+ gxde-dock,
- dde-control-center(>> 2.90.5),
+ gxde-control-center,
- dde-launcher,
+ gxde-launcher,
- startdde,
+ startgxde,
- dde-session-ui,
+ gxde-session-ui,
  gxde-artwork,
- dde-file-manager,
+ gxde-file-manager,
  dde-qt5integration,
  eject,
  gxde-wallpapers,
  fonts-noto,
- dde-kwin | gxde-kwin,
+ gxde-wm-shim | gxde-kwin-neo,
  deepin-screensaver,
  gxde-default-settings,
  gxde-shell-tools,
  gxde-compressor,
- gxde-introduction,
 Recommends:
- gxde-desktop-extra,
+ gxde-desktop-extra | gxde-desktop-android,
  gxde-editor,
+ gxde-introduction,
  pppoe,
  gvfs-fuse,
  smbclient,
@@ -143,13 +146,11 @@ Recommends:
  x-display-manager,
  gxde-image-viewer,
  gxde-calendar,
- gxde-calculator,
  gxde-voice-recorder,
  deepin-screen-recorder,
  warm-sched,
  deepin-camera,
  gxde-top-panel,
- plank,
  fcitx5-material-color,
  tela-grub2-themes,
  plymouth-theme-gxde-logo,
@@ -158,11 +159,9 @@ Recommends:
  fantascene-dynamic-wallpaper,
  x11vnc,
 Conflicts:
- dde-control-center(<< 2.90.5),
  deepin-desktop-environment-desktop,
  deepin-desktop-environment-dock,
  deepin-desktop-environment-launcher,
- libdframeworkdbus2(>> 15)
 Description: GXDE New Desktop Environment - Next
  This is a meta package depends GXDE New Desktop Envrionment.
  .