新增gparted

update MAINTAINERS.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2026-08-06 13:03:57 +08:00 · 2024-11-10 11:15:03 +08:00 · 2024-11-08 16:32:30 +00:00 · 2024-11-08 16:32:01 +00:00 · 2024-11-08 16:31:44 +00:00 · 2024-11-08 16:28:47 +00:00
7 changed files with 96 additions and 36 deletions
@@ -208,7 +208,8 @@ jobs:

      - name: Configure Base System
        run: |
-          bash .github/workflows/configure-building-enviroment-base-system.sh loong64 unstable $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian-ports/
+          bash .github/workflows/configure-building-enviroment-base-system.sh loong64 unstable $REPOSITORY https://packages.gxde.org/debian-loong64/
+          #bash .github/workflows/configure-building-enviroment-base-system.sh loong64 unstable $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian-ports/

      - name: Building ${{ GITHUB.repository }}
        run: |
@@ -63,9 +63,9 @@ jobs:
          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 $UPATH/$tarName > /dev/null
+          sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM tianlu $UPATH/$tarName > /dev/null

-  amd64:
+  amd64-Debian12:
    runs-on: ubuntu-latest
    steps:
      - name: Clone Repository To Get Script
@@ -106,10 +106,11 @@ jobs:
          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 $UPATH/$tarName > /dev/null
+          sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM tianlu $UPATH/$tarName > /dev/null

  arm64:
    runs-on: ubuntu-24.04
+    #runs-on: self-hosted
    steps:
      - name: Clone Repository To Get Script
        run: |
@@ -149,7 +150,7 @@ jobs:
          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 $UPATH/$tarName > /dev/null
+          sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM tianlu $UPATH/$tarName > /dev/null
  

  mips64:
@@ -193,7 +194,7 @@ jobs:
          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 $UPATH/$tarName > /dev/null
+          sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM tianlu $UPATH/$tarName > /dev/null

  loong64:
    runs-on: ubuntu-24.04
@@ -208,7 +209,8 @@ jobs:

      - name: Configure Base System
        run: |
-          bash .github/workflows/configure-building-enviroment-base-system.sh loong64 unstable $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian-ports/
+          bash .github/workflows/configure-building-enviroment-base-system.sh loong64 unstable $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://packages.gxde.org/debian-loong64/
+          #bash .github/workflows/configure-building-enviroment-base-system.sh loong64 unstable $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian-ports/

      - name: Building ${{ GITHUB.repository }}
        run: |
@@ -238,7 +240,7 @@ jobs:
          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 $UPATH/$tarName > /dev/null
+          sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM tianlu $UPATH/$tarName > /dev/null

  

@@ -290,7 +292,51 @@ jobs:
          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 $UPATH/$tarName > /dev/null
+            sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM tianlu $UPATH/$tarName > /dev/null
          fi

-      
+#  amd64-ubuntu24:
+#    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: |
+#          git clone https://github.com/$GITHUB_REPOSITORY 
+#          cd $(basename $GITHUB_REPOSITORY)
+#          sudo bash ../.github/workflows/configure-building-enviroment.sh
+#
+#      - name: Building ${{ GITHUB.repository }}
+#        run: |
+#          cd $(basename $GITHUB_REPOSITORY)
+#          env GO111MODULE=off dpkg-buildpackage -b
+#
+#      - name: Remove Debug Package
+#        run: |
+#          rm -rfv *dbg*.deb
+#
+#      - name: Pack tar
+#        run: |
+#          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 hetao $UPATH/$tarName > /dev/null
+  
@@ -15,14 +15,21 @@ export DEBIAN_FRONTEND=noninteractive  # 防止卡 tzdate
 #    echo "deb-src http://deb.debian.org/debian sid main" > /etc/apt/sources.list.d/debian-sources.list
 #fi
 # 写入 GXDE 源
-echo "deb [trusted=true] https://repo1.gxde.top/gxde-os/tianlu ./" >> /etc/apt/sources.list.d/gxde-os.list
-echo "deb [trusted=true] https://repo1.gxde.top/gxde-os/bixie ./" >> /etc/apt/sources.list.d/gxde-os.list
-if [[ $(dpkg --print-architecture) == "loong64" ]]; then
-    echo "deb [trusted=true] http://deb.debian.org/debian-ports unreleased main" > /etc/apt/sources.list.d/debian-unreleased.list
+# 判断是否是 Ubuntu
+isUbuntu=$(cat /etc/os-release | grep Ubuntu | wc -l)
+if [[ $isUbuntu -gt 1 ]]; then
+    echo "deb [trusted=true] https://repo1.gxde.top/gxde-os/hetao ./" >> /etc/apt/sources.list.d/gxde-os.list
+else
+    echo "deb [trusted=true] https://repo1.gxde.top/gxde-os/tianlu ./" >> /etc/apt/sources.list.d/gxde-os.list
+    echo "deb [trusted=true] https://repo1.gxde.top/gxde-os/bixie ./" >> /etc/apt/sources.list.d/gxde-os.list
 fi
+if [[ $(dpkg --print-architecture) == "loong64" ]]; then
+    echo "deb [trusted=true] https://packages.gxde.org/debian-loong64/ unreleased main" > /etc/apt/sources.list.d/debian-unreleased.list
+fi
+apt install debian-ports-archive-keyring debian-archive-keyring -y
 for i in {1..8};
 do
-    apt update -y
+    apt update -o Acquire::Check-Valid-Until=false -y
    if [[ $? == 0 ]]; then
        break
    fi
@@ -53,4 +60,4 @@ do
    fi
    sleep 1
 done
-exit 0
+exit 0
@@ -0,0 +1,7 @@
+This file contains honored contributers of GXDE and GXDE OS. The list is in alphabetical order. 
+
+elysia <c.elysia@foxmail.com>
+gfdgd xi <3025613752@qq.com>
+qingyu <qingyuqingyu123@proton.me>
+shenmo <shenmo@spark-app.store>
+yoyo <chowhound_xb@163.com>
@@ -1,13 +1,9 @@
-<center><img src=new-logo-long.png width=300/></center>
-<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>


+## Welcome to GXDE OS Community 
+
 **[中文](/README.zh.md)**

-
-## Introduction
-
 GXDE OS is an Debian based Linux distro featuring GXDE Desktop Environment. It offers an elegant, beautifu, light weight and out-of-the-box experience. 

 ### Classic and Extended Deepin DE Experience 
@@ -32,6 +28,7 @@ Also, simply replace apt with aptss will  `apt` with `aptss` command can boost y
 Please Click the Star in the Upper Right Corner, Your Support is Our Greatest Motivation

 ### User Group
+<center><img src=new-logo-long.png width=300/></center>

 QQ Group: 881201853

@@ -1,19 +1,21 @@
-gxde (2024.10.14) UNRELEASED; urgency=medium
+gxde (2024.11.10) UNRELEASED; urgency=medium
+
+  * Change package: dde-calendar --> gxde-calendar
+  * Add package: gparted
+
+ -- gfdgd_xi <3025613752@qq.com>  Sun, 10 Nov 2024 11:14:38 +0800
+
+gxde (2024.10.20) UNRELEASED; urgency=medium

  * Add package: gxde-boot-maker
  * Add package : system-config-printer
  * Add package : deepin-clone
  * Add package: deepin-system-monitor
+  * Change package: deepin-movie --> gxde-movie
+  * Change package: gxde-download --> gxde-downloader

 -- shenmo <shenmo@spark-app.store>  Fri, 04 Oct 2024 09:22:50 +0800

-gxde (2024.10.01) UNRELEASED; urgency=medium
-
-  * fix 15.14 conponents dependencies
-  * 
-
- -- gfdgd_xi <3025613752@qq.com>  Sat, 05 Oct 2024 13:39:12 +0800
-
 gxde (2024.09.01) UNRELEASED; urgency=medium

  * Non-maintainer upload.
@@ -8,7 +8,7 @@ Homepage: http://www.gfdgdxi.top

 Package: gxde-desktop-extra
 Architecture: all
-Depends: ${misc:Depends},
+Recommends: ${misc:Depends},
 gxde-voice-recorder,
 gxde-calculator,
 gxde-terminal,
@@ -17,13 +17,11 @@ Depends: ${misc:Depends},
 gxde-image-viewer,
 gxde-icon-theme,
 gxde-sea-icon-theme,
- gxde-download,
 gxde-ocr,
 gxde-music,
 gxde-picker,
 gxde-font-installer,
- deepin-movie,
- gxde-requ,
+ gxde-movie,
 gxde-quick-hash,
 gxde-sendbylan,
 gxde-dict,
@@ -32,7 +30,9 @@ Depends: ${misc:Depends},
 gxde-boot-maker,
 deepin-clone,
 system-config-printer,
- deepin-system-monitor
+ deepin-system-monitor,
+ gxde-downloader,
+ gparted
 Description: GXDE New Desktop Environment Extra - Next
 This is a meta package depends GXDE New Desktop Envrionment Extra.
 .
@@ -120,7 +120,7 @@ Recommends:
 miraclecast,
 x-display-manager,
 gxde-image-viewer,
- dde-calendar,
+ gxde-calendar,
 gxde-calculator,
 gxde-voice-recorder,
 deepin-screen-recorder,
Author	SHA1	Message	Date
gfdgd-xi	f6edd4e141	新增gparted	2024-11-10 11:15:03 +08:00
shenmo7192andGitee	70189c24dd	update MAINTAINERS. Signed-off-by: shenmo <jifengshenmo@outlook.com>	2024-11-08 16:32:30 +00:00
shenmo7192andGitee	a23abe9df7	!6 update MAINTAINERS. Merge pull request !6 from AAA Elysia 猫猫侠 ⁧~喵/N/A	2024-11-08 16:32:01 +00:00
shenmo7192andGitee	9436e0311a	update MAINTAINERS. Signed-off-by: shenmo <jifengshenmo@outlook.com>	2024-11-08 16:31:44 +00:00
AAA Elysia 猫猫侠 ⁧~喵andGitee	8e33673d02	update MAINTAINERS. Add elysia to list	2024-11-08 16:28:47 +00:00
gfdgd-xi	2180a04d29	停止ubuntu的构建	2024-11-06 22:03:36 +08:00
gfdgd-xi	f06089d83f	loong64配置容器时会安装签名以避免反复apt update	2024-11-03 15:05:10 +08:00
shenmo7192andGitee	e84224970c	!5 update MAINTAINERS. Merge pull request !5 from 柚子/N/A	2024-10-29 15:37:53 +00:00
柚子andGitee	8368ed168a	update MAINTAINERS. Signed-off-by: 柚子 <chowhound_xb@163.com>	2024-10-29 15:36:08 +00:00
shenmo7192andGitee	eed4e0d776	update MAINTAINERS. Signed-off-by: shenmo <jifengshenmo@outlook.com>	2024-10-29 15:02:44 +00:00
gfdgd-xi	d16adc50e4	补充MAINTAINERS	2024-10-29 22:55:35 +08:00
gfdgd-xiandGitee	4efabb2023	!4 维护者名单 Merge pull request !4 from qingyu/N/A	2024-10-29 14:54:16 +00:00
qingyuandGitee	c7e3f6ed0d	docs: 维护者名单 Signed-off-by: qingyu <335809116@qq.com>	2024-10-29 14:21:51 +00:00
gfdgd-xi	01bae0a5e6	更换url	2024-10-27 14:15:19 +08:00
gfdgd-xi	0d261f4f57	少改了个地方	2024-10-27 12:05:38 +08:00
gfdgd-xi	fcb98c9b83	loong64指定特定的源	2024-10-27 06:44:34 +08:00
gfdgd-xi	7c79626344	调整gxde-desktop-extra的依赖包为recommends	2024-10-26 15:17:59 +08:00
gfdgd-xi	73b6d58a42	修改包名	2024-10-26 15:06:54 +08:00
shenmo7192	f44cf966ae	fix coma	2024-10-20 20:42:27 +08:00
shenmo7192andGitee	b62bb30caa	gxde-download --> gxde-downloader Signed-off-by: shenmo <jifengshenmo@outlook.com>	2024-10-20 08:58:43 +00:00
shenmo7192	f9060bd8e5	2024.10.19	2024-10-19 20:00:27 +08:00
gfdgd-xi	8a7549b717	更换机器	2024-10-17 22:30:48 +08:00
gfdgd-xi	b9253b56d2	更换机器	2024-10-17 22:25:58 +08:00
gfdgd-xi	b6c425bb47	更换机器	2024-10-17 22:22:02 +08:00
gfdgd-xi	6e5aa6329d	Merge branch 'master' of github.com:GXDE-OS/.github	2024-10-14 22:34:06 +08:00
gfdgd-xi	41af5d686b	漏了sudo	2024-10-14 22:33:26 +08:00
gfdgd-xi	285e6e9b6a	修复git clone目录问题	2024-10-14 22:30:49 +08:00
gfdgd-xi	6a7562a5dd	Merge branch 'master' of https://gitee.com/GXDE-OS/GXDE	2024-10-14 22:15:11 +08:00
gfdgd-xi	0f073670f2	ubuntu test	2024-10-14 22:15:01 +08:00
shenmoandGitHub	e4224ecaaa	Update README.md	2024-10-14 19:16:09 +08:00
shenmoandGitHub	7856dd97cf	Update README.md	2024-10-14 19:15:48 +08:00
shenmoandGitHub	9af839e7de	Update README.md	2024-10-14 19:15:23 +08:00
shenmoandGitHub	29f824d25b	Update README.md	2024-10-14 19:14:33 +08:00
shenmoandGitHub	76b325bd20	Update README.md	2024-10-14 19:13:49 +08:00