Merge pull request #118 from wychlw/package_index_sync

Package Sync: Add a bunch of images, add threadhold
ruyisdk · Jan 2, 2025 · e9c9d3c · e9c9d3c
2 parents bf64bcd + 6bf3355
commit e9c9d3c
Show file tree

Hide file tree

Showing 29 changed files with 544 additions and 79 deletions.
diff --git a/.github/workflows/package-index-sync.yaml b/.github/workflows/package-index-sync.yaml
@@ -28,10 +28,22 @@ on:
   # push: # Uncomment this line to enable push event, but it is not recommended as it may cause unnecessary PRs. Use workflow_dispatch instead.
 
 jobs:
+  check_should_run:
+    name: Check Should Run
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check Should Run
+        run: |
+          echo "Event Name: ${{ github.event_name }}"
+          echo "Ref: ${{ github.ref }}"
+          echo "Repository Owner: ${{ github.repository_owner }}"
+          echo "Inputs: makepr ${{ inputs.makepr }} debuginfo ${{ inputs.debuginfo }}"
+          echo "Should Run Auto: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'ruyisdk' ) }}"
+          echo "Should Run Manual: ${{ ( github.event_name == 'workflow_dispatch' ) }}"
   build:
     name: Generate and Upload
     runs-on: ubuntu-latest
-    if: ${{ ( github.event_name == 'push' && github.ref == github.ref == 'refs/heads/main' && github.repository_owner == 'ruyisdk' ) ||  ( github.event_name == 'workflow_dispatch' ) }}
+    if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'ruyisdk' ) ||  ( github.event_name == 'workflow_dispatch' ) }}
     environment: ruyi-sync
     env:
       GITHUB_TOKEN: ${{ secrets.GHO_TOKEN }}

diff --git a/Duo/README.md b/Duo/README.md
@@ -1,4 +1,5 @@
 ---
+vendor: milkv_duo
 product: Milk-V Duo (64M)
 cpu: CV1800B
 cpu_core: XuanTie C906

diff --git a/Duo256m/BuildRoot/README.md b/Duo256m/BuildRoot/README.md
@@ -1,6 +1,6 @@
 ---
 sys: buildroot
-sys_ver: null
+sys_ver: v1.1.0
 sys_var: null
 
 status: basic

diff --git a/Duo256m/README.md b/Duo256m/README.md
@@ -1,4 +1,5 @@
 ---
+vendor: milkv_duo256m
 product: Milk-V Duo (256M)
 cpu: SG2002
 cpu_core: XuanTie C906 + ARM Cortex-A53

diff --git a/Duo_S/BuildRoot/README.md b/Duo_S/BuildRoot/README.md
@@ -1,6 +1,6 @@
 ---
 sys: buildroot
-sys_ver: null
+sys_ver: v1.1.3
 sys_var: null
 
 status: basic

diff --git a/Duo_S/README.md b/Duo_S/README.md
@@ -1,4 +1,5 @@
 ---
+vendor: milkv_duos
 product: Milk-V Duo S
 cpu: SG2000
 cpu_core: XuanTie C906 + ARM Cortex-A53

diff --git a/LicheeCluster4A/README.md b/LicheeCluster4A/README.md
@@ -1,4 +1,5 @@
 ---
+vendor: sipeed_licheecluster4a
 product: Lichee Cluster 4A
 cpu: TH1520
 cpu_core: XuanTie C910 + XuanTie C906 + XuanTie E902

diff --git a/LicheeCluster4A/RevyOS/README.md b/LicheeCluster4A/RevyOS/README.md
@@ -1,6 +1,6 @@
 ---
 sys: revyos
-sys_ver: 12
+sys_ver: "20240127"
 sys_var: null
 
 status: basic

diff --git a/LicheeConsole4A/README.md b/LicheeConsole4A/README.md
@@ -1,4 +1,5 @@
 ---
+vendor: sipeed_licheeconsole4a
 product: Lichee Console 4A
 cpu: TH1520
 cpu_core: XuanTie C910 + XuanTie C906 + XuanTie E902

diff --git a/LicheeConsole4A/RevyOS/README.md b/LicheeConsole4A/RevyOS/README.md
@@ -1,6 +1,6 @@
 ---
 sys: revyos
-sys_ver: 12
+sys_ver: "20240202"
 sys_var: null
 
 status: good

diff --git a/LicheeRV_Nano/BuildRoot/README.md b/LicheeRV_Nano/BuildRoot/README.md
@@ -1,6 +1,6 @@
 ---
 sys: buildroot
-sys_ver: null
+sys_ver: "20241129"
 sys_var: null
 
 status: basic

diff --git a/LicheeRV_Nano/Debian/README.md b/LicheeRV_Nano/Debian/README.md
@@ -1,6 +1,6 @@
 ---
 sys: debian
-sys_ver: null
+sys_ver: "v1.4.0"
 sys_var: null
 
 status: basic

diff --git a/LicheeRV_Nano/README.md b/LicheeRV_Nano/README.md
@@ -1,4 +1,5 @@
 ---
+vendor: sipeed_licheervnano
 product: LicheeRV Nano
 cpu: SG2002
 cpu_core: XuanTie C906 + ARM Cortex-A53

diff --git a/Mars/BuildRoot/README.md b/Mars/BuildRoot/README.md
@@ -1,6 +1,6 @@
 ---
 sys: buildroot
-sys_ver: null
+sys_ver: "1.0.6"
 sys_var: null
 
 status: basic

diff --git a/Mars/README.md b/Mars/README.md
@@ -1,4 +1,5 @@
 ---
+vendor: milkv_mars
 product: Milk-V Mars
 cpu: JH7110
 cpu_core: SiFive U74 + SiFive S7 + SiFive E24

diff --git a/STAR64/Armbian/README.md b/STAR64/Armbian/README.md
@@ -1,10 +1,13 @@
 ---
 sys: armbian
-sys_ver: 24.5.0
+sys_ver: 25.2.0-trunk.86
 sys_var: null
 
 status: cft
-last_update: 2024-06-21
+last_update: 2024-12-12
+
+# Due to the complexcity in armbian mirror naming, we needs to provide the download link for sync tools in the metadata.
+link: https://github.com/armbian/community/releases/download/25.2.0-trunk.86/Armbian_community_25.2.0-trunk.86_Star64_noble_edge_5.15.0_xfce_desktop.img.xz
 ---
 
 # Armbian Star64 Test Report
@@ -13,7 +16,7 @@ last_update: 2024-06-21
 
 ### Operating System Information
 
-- Download Link: https://www.armbian.com/star64/
+- Download Link: https://github.com/armbian/community/releases/download/25.2.0-trunk.86/Armbian_community_25.2.0-trunk.86_Star64_noble_edge_5.15.0_xfce_desktop.img.xz
 - Reference Installation Document: https://www.hackster.io/lupyuen/rtos-on-a-risc-v-sbc-star64-jh7110-apache-nuttx-2a7429
 
 ### Hardware Information
@@ -28,8 +31,8 @@ last_update: 2024-06-21
 
 After downloading, unzip and flash the image (using the xfce version as an example):
 ```bash
-unxz -k Armbian_community_24.5.0-trunk.667_Star64_jammy_edge_5.15.0_xfce_desktop.img.xz
-sudo dd if=Armbian_community_24.5.0-trunk.667_Star64_jammy_edge_5.15.0_xfce_desktop.img of=/dev/your/sdcard bs=1M status=progress
+unxz -k Armbian_community_25.2.0-trunk.86_Star64_noble_edge_5.15.0_xfce_desktop.img.xz
+sudo dd if=Armbian_community_25.2.0-trunk.86_Star64_noble_edge_5.15.0_xfce_desktop.img of=/dev/your/sdcard bs=1M status=progress
 ```
 
 ### Logging into the System

diff --git a/STAR64/Armbian/README_zh.md b/STAR64/Armbian/README_zh.md
@@ -4,7 +4,7 @@
 
 ### 操作系统信息
 
-- 下载链接：https://www.armbian.com/star64/
+- 下载链接：https://github.com/armbian/community/releases/download/25.2.0-trunk.86/Armbian_community_25.2.0-trunk.86_Star64_noble_edge_5.15.0_xfce_desktop.img.xz
 - 参考安装文档：https://www.hackster.io/lupyuen/rtos-on-a-risc-v-sbc-star64-jh7110-apache-nuttx-2a7429
 
 ### 硬件信息
@@ -19,8 +19,8 @@
 
 下载后，解压并烧写镜像（以下以 xfce 版为例）：
 ```bash
-unxz -k Armbian_community_24.5.0-trunk.667_Star64_jammy_edge_5.15.0_xfce_desktop.img.xz
-sudo dd if=Armbian_community_24.5.0-trunk.667_Star64_jammy_edge_5.15.0_xfce_desktop.img of=/dev/your/sdcard bs=1M status=progress
+unxz -k Armbian_community_25.2.0-trunk.86_Star64_noble_edge_5.15.0_xfce_desktop.img.xz
+sudo dd if=Armbian_community_25.2.0-trunk.86_Star64_noble_edge_5.15.0_xfce_desktop.img of=/dev/your/sdcard bs=1M status=progress
 ```
 
 ### 登录系统

diff --git a/STAR64/README.md b/STAR64/README.md
@@ -1,4 +1,5 @@
 ---
+vendor: pine64_star64
 product: Star64
 cpu: JH7110
 cpu_core: SiFive U74 + SiFive S7 + SiFive E24

diff --git a/assets/config.toml b/assets/config.toml
@@ -7,3 +7,50 @@ user_agent = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Ge
 source = "regex"
 url = "https://mirror.iscas.ac.cn/revyos/extra/images/lpi4a/"
 regex = '<a href="(\d{8})/" title="\1">\1/</a>'
+
+[sipeed_licheecluster4a-debian-null] # RevyOS is seen as Debian
+source = "regex"
+url = "https://mirror.iscas.ac.cn/revyos/extra/images/lpi4amain/"
+regex = '<a href="(\d{8})/" title="\1">\1/</a>'
+
+[sipeed_licheeconsole4a-debian-null]
+source = "github"
+github = "0x754C/sipeed-th1520-laptop-extra"
+use_latest_release = true
+
+[milkv_duo-buildroot-null]
+source = "github"
+github = "milkv-duo/duo-buildroot-sdk"
+use_latest_release = true
+
+[milkv_duo256m-buildroot-null]
+source = "github"
+github = "milkv-duo/duo-buildroot-sdk"
+use_latest_release = true
+
+[milkv_duos-buildroot-null]
+source = "github"
+github = "milkv-duo/duo-buildroot-sdk"
+use_latest_release = true
+
+[pine64_star64-armbian-null]
+source = "github"
+github = "armbian/community"
+use_latest_release = true
+
+[sipeed_licheervnano-buildroot-null]
+source = "github"
+github = "sipeed/LicheeRV-Nano-Build"
+use_latest_release = true
+
+[sipeed_licheervnano-debian-null]
+source = "github"
+github = "Fishwaldo/sophgo-sg200x-debian"
+use_latest_release = true
+
+[milkv_mars-buildroot-null]
+source = "github"
+github = "milkv-mars/mars-buildroot-sdk"
+use_latest_release = true
+
+
diff --git a/assets/generate_svgimage.py b/assets/generate_svgimage.py
@@ -9,7 +9,7 @@
 from src.svg_gen import SvgConf, SvgNode, SvgXml, gen_html, putconf, SvgRectContainer
 from src.svg_gen import SvgText, SvgTextCenter, SvgMoveTo, SvgCR, SvgLF, SvgGroup
 from src.svg_gen import SvgAdvancer, SvgSvg, SvgLine, SvgLink
-from src.matrix_parser import Systems, status_map
+from src.matrix_parser import Systems
 
 
 def gen_svg_table(conf: SvgConf, systems: Systems, need_systems: dict[str],
@@ -61,8 +61,8 @@ def gen_svg_table(conf: SvgConf, systems: Systems, need_systems: dict[str],
                     continue
                 flag = True
                 if len(system.variant) == 1:
-                    sys_t = SvgText(status_map(
-                        system.variant[0].status), False)
+                    sys_t = SvgText(
+                        str(system.variant[0].status), False)
                     # Use python's dynamic feature to add link without modifying the class
                     sys_t.link = system.variant[0].link
                     board_group.append(sys_t)
@@ -71,7 +71,7 @@ def gen_svg_table(conf: SvgConf, systems: Systems, need_systems: dict[str],
                 for var in system.variant:
                     sys_var = var.sys_var if var.sys_var is not None else "main"
                     sys_t = SvgText(sys_var + ': ' +
-                                    status_map(var.status), False)
+                                    str(var.status), False)
                     # Same as above
                     sys_t.link = var.link
                     var_g.append(sys_t)

diff --git a/assets/renew_ruyi_index.py b/assets/renew_ruyi_index.py
@@ -9,7 +9,7 @@
 import logging
 import colorlog
 
-from src.matrix_parser import Systems
+from src.matrix_parser import Systems, ImageStatus
 from src.ruyi_index_updator import RuyiDiff, RuyiGitRepo
 
 
@@ -35,6 +35,12 @@ def main():
     arg.add_argument(
         '--warn', help='output the warn to the file', default=None
     )
+    arg.add_argument(
+        '--threadhold', help='the status threadhold can be synced', default='basic'
+    )
+    arg.add_argument(
+        'plugin_names', help='the plugins to run, default to all', nargs='*'
+    )
     args = arg.parse_args()
 
     handler = colorlog.StreamHandler()
@@ -71,7 +77,8 @@ def main():
     diffs = RuyiDiff(matrix, args.config)
     repo = RuyiGitRepo(index_path)
 
-    for diff in diffs.gen_diff():
+    threadhold = ImageStatus(args.threadhold)
+    for diff in diffs.gen_diff(args.plugin_names, threadhold):
         pr = repo.upload_image(diff)
         if pr is None:
             continue