新增屏保

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

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

@@ -0,0 +1,137 @@
+name: Building GXDE Package
+
+on:
+  workflow_call:
+    secrets:
+      PASSWD:
+        required: true
+      USERS:
+        required: true
+      HOST: 
+        required: true
+      UPATH: 
+        required: true
+      UPROGRAM: 
+        required: true
+      UPORT: 
+        required: true
+
+    inputs:
+      arch:
+        type: string
+        description: 'Rootfs Arch'
+        required: true
+
+      rootfs-codename:
+        type: string
+        description: 'Rootfs Codename'
+        required: true
+
+      rootfs-source:
+        type: string
+        description: 'Rootfs Source Url'
+        required: true
+
+      gxde-codename:
+        type: string
+        description: 'GXDE OS Codename'
+        required: true
+
+      gxde-codename-upload:
+        type: string
+        description: 'GXDE OS Codename'
+        required: true
+
+      display-name:
+        required: false
+        type: string
+
+
+
+env:
+  REPOSITORY: https://github.com/GXDE-OS/GXDE  
+  BOTTLEPATH: system-bottle
+
+jobs:  
+  build:
+    name: ${{ inputs.display-name || 'Build Job' }}
+    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 ${{ inputs.arch }} \
+            ${{ inputs.rootfs-codename }} \
+            $REPOSITORY \
+            https://github.com/$GITHUB_REPOSITORY \
+            ${{ inputs.rootfs-source }}
+
+      - 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
+          else
+            env gitPath=$gitPath bash .github/workflows/run-command-in-chroot.sh env GXDE_CODENAME=${{ inputs.gxde-codename }} GO111MODULE=off bash build-deb.sh
+          fi
+          cp $BOTTLEPATH/*.deb . -rv
+          sudo rename 's/\.deb$/_${{ inputs.gxde-codename }}.deb/' *.deb
+
+      - 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 ${{ inputs.gxde-codename-upload }} $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-meimei.yml

@@ -0,0 +1,34 @@
+name: Building GXDE Package (meimei)
+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-meimei:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-base.yml@master
+    secrets: inherit
+    with:
+      display-name: loong64-meimei
+      arch: loong64
+      rootfs-codename: loongnix
+      rootfs-source: https://pkg.loongnix.cn/loongnix/25
+      gxde-codename: meimei
+      gxde-codename-upload: meimei

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

@@ -22,6 +22,10 @@ env:
   BOTTLEPATH: system-bottle
 
 jobs:  
+  call:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-zhuangzhuang.yml@master
+    secrets: inherit
+
   loong64:
     runs-on: ubuntu-24.04
     steps:

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

@@ -0,0 +1,89 @@
+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
+
+  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
+
+  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
+
+  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
+
+  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

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

.github/workflows/building-deb.yml

@@ -22,520 +22,14 @@ env:
   BOTTLEPATH: system-bottle
 
 jobs:  
-  i386:
+  call-zhuangzhuang:
-    runs-on: ubuntu-latest
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-zhuangzhuang.yml@master
-    steps:
+    secrets: inherit
-      # 由于默认的 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: |
-          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
-
-      - 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
-          sudo rename 's/\.deb$/_tianlu.deb/' *.deb
-
-      - 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
-    
-      - 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-Debian12:
-    runs-on: ubuntu-latest
-    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: |
-          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
-
-      - 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
-          sudo rename 's/\.deb$/_tianlu.deb/' *.deb
-
-      - 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
-
-      - 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:
-      # 由于默认的 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: |
-          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
-
-      - 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
-          sudo rename 's/\.deb$/_tianlu.deb/' *.deb
-
-      - 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
   
-      - name: Create Release
+  call-meimei:
-        uses: softprops/action-gh-release@v1
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-meimei.yml@master
-        if: startsWith(github.ref, 'refs/tags/')
+    secrets: inherit
-        env:
-          GITHUB_TOKEN: ${{ secrets.RELEASE_TOCKEN_GITHUB }}
-        with:
-          files: |
-            *.deb
-          generate_release_notes: true
-
-  mips64:
-    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: |
-          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
-
-      - 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
-          sudo rename 's/\.deb$/_tianlu.deb/' *.deb
-
-      - 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
-
-      - 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
-
-  loong64-debian-port:
-    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
-          cp $BOTTLEPATH/*.deb . -rv
-          sudo rename 's/\.deb$/_tianlu.deb/' *.deb
-
-      - 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
-
-      - 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
-
-  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
-          cp $BOTTLEPATH/*.deb . -rv 
-          sudo rename 's/\.deb$/_tianlu.deb/' *.deb
-
-      - 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
-
-      - 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
-
   
-  loong64-loongnix:
+  call-tianlu:
-    runs-on: ubuntu-24.04
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb-tianlu.yml@master
-    steps:
+    secrets: inherit
-      # 由于默认的 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 loongnix $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://pkg.loongnix.cn/loongnix/25
-
-      - name: Building ${{ GITHUB.repository }}
-        run: |
-          env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh env GXDE_CODENAME=meimei GO111MODULE=off dpkg-buildpackage -b
-          cp $BOTTLEPATH/*.deb . -rv
-          sudo rename 's/\.deb$/_meimei.deb/' *.deb
-
-      - 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 meimei $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/configure-building-enviroment-base-system.sh

@@ -48,6 +48,7 @@ if [[ $6 == "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
 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
@@ -59,9 +60,16 @@ sudo chroot $bottlePath git clone $4 #--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
-if [[ $2 == "loongnix" ]]; then
+case $2 in
-    env gitPath=$(basename $4) bash .github/workflows/run-command-in-chroot.sh .github/workflows/configure-building-enviroment.sh meimei
+    "trixie")
-else
+        env gitPath=$(basename $4) bash .github/workflows/run-command-in-chroot.sh .github/workflows/configure-building-enviroment.sh zhuangzhuang
-    env gitPath=$(basename $4) bash .github/workflows/run-command-in-chroot.sh .github/workflows/configure-building-enviroment.sh
+    ;;
-fi
+    "loongnix")
+        env gitPath=$(basename $4) bash .github/workflows/run-command-in-chroot.sh .github/workflows/configure-building-enviroment.sh meimei
+    ;;
+    *)
+        env gitPath=$(basename $4) bash .github/workflows/run-command-in-chroot.sh .github/workflows/configure-building-enviroment.sh
+    ;;
+esac
+
 exit 0

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

@@ -17,11 +17,13 @@ export DEBIAN_FRONTEND=noninteractive  # 防止卡 tzdate
 # 写入 GXDE 源
 # 判断是否是 Ubuntu
 #isUbuntu=$(cat /etc/os-release | grep Ubuntu | wc -l)
-if [[ $1 == "meimei" ]]; then
+
-    echo "deb [trusted=true] https://repo.gxde.org/gxde-os/meimei ./" >> /etc/apt/sources.list.d/gxde-os.list
+
-else
+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
+else
+    echo "deb [trusted=true] https://repo.gxde.org/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
@@ -53,7 +55,9 @@ 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
+apt download deepin-desktop-base
+dpkg -x deepin-desktop-base_*.deb /
     
 for i in {1..5};
 do

debian/changelog

@@ -1,16 +1,10 @@
-gxde (2025.01.26) UNRELEASED; urgency=medium
+gxde (2025.04.06) UNRELEASED; urgency=medium
 
-  * Change package: dde-calendar --> gxde-calendar
+  * 新增 remmina 以解决远程问题
-  * Add package: gparted
+  * 改为安装 dde-printer 
-  * Change gxde-desktop depends, gxde-desktop-extra, gxde-desktop-android depends and conflicts
+  * 新增屏保
-  * Replace file-roller by gxde-compressor 
-  * Recommend deepin-camera
-  * Replace gxde-calculator with deepin-calc
-  * Prefer dde-kwin
-  * 预装扫雷、2048 小游戏
-  * Android 端不默认安装 papirus-icon-theme，PC 端默认安装
 
- -- gfdgd_xi <3025613752@qq.com>  Sun, 26 Jan 2025 10:21:23 +0800
+ -- gfdgd_xi <3025613752@qq.com>  Sun, 06 Apr 2025 10:58:29 +0800
 
 gxde (2024.10.20) UNRELEASED; urgency=medium
 

debian/control

@@ -29,7 +29,7 @@ Recommends: ${misc:Depends},
  spark-store | aptss,
  gxde-boot-maker,
  deepin-clone,
- system-config-printer,
+ dde-printer | system-config-printer,
  deepin-system-monitor,
  gxde-downloader,
  gparted,
@@ -38,6 +38,9 @@ Recommends: ${misc:Depends},
  com.github.minesweep,
  2048-qt,
  papirus-icon-theme,
+ remmina,
+ screensaver-pp,
+ gxde-time-screensaver,
 Description: GXDE New Desktop Environment Extra - Next
  This is a meta package depends GXDE New Desktop Envrionment Extra.
  .