ci: Replace the judgment file modification mechanism of bsp_building.yml and incorporate the PR status show into bsp_building.yml

Author: hydevcode

.github/workflows/bsp_buildings.yml

@@ -41,66 +41,29 @@ permissions:
 jobs:
   generate-matrix:
     runs-on: ubuntu-22.04
+    name: Generate Matrix
     outputs:
       filtered_matrix: ${{ steps.filter.outputs.filtered_matrix }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@main
         with:
-          sparse-checkout: .github/ALL_BSP_COMPILE.json
           persist-credentials: false
-      - name: Read matrix config
-        id: read-config
-        run: |
-          #读取ALL_BSP_COMPILE.json文件
-          raw_matrix_base64=$(cat .github/ALL_BSP_COMPILE.json |egrep -v '^//'|base64 -w 0)
-          echo "raw_matrix=$raw_matrix_base64" >> $GITHUB_OUTPUT
-      - name: Get changed files
-        id: changed_files
-        if: github.event_name == 'pull_request'
-        run: |
-          changed_files=$(curl -s \
-            "https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/files" | \
-            jq -r '.[].filename') 
-          prefix=$(echo "$changed_files" | cut -d'/' -f1 | sort -u )
-          has_bsp=true
-          for r in "$prefix"; do
-            if [[ ! "$r" == "bsp" ]]; then
-                has_bsp=false
-                break
-            fi
-          done
-          if [[ $has_bsp == true ]]; then
-            changed_files=$(echo "${changed_files}"| cut -d'/' -f2 | sort -u| tr '\n' ',' | sed 's/,$//')
-            echo "CHANGED_FILES=[${changed_files}]" >> $GITHUB_OUTPUT
-          fi
-          #获取修改文件的路径，如果有bsp以外的文件夹则编译全部bsp，否则获取对应文件夹名
-
-          echo "${changed_files}"
+          fetch-depth: 0
       - name: Filter matrix
         id: filter
         run: |
-          raw_matrix=$(echo "${{ steps.read-config.outputs.raw_matrix }}" | base64 --decode)
-
-          CHANGED_FILES=${{ steps.changed_files.outputs.CHANGED_FILES }}
-          CHANGED_FILES=$(echo "$CHANGED_FILES" | sed 's/\[\|\]//g')
-          # 将修改的文件路径与ALL_BSP_COMPILE.json文件的SUB_RTT_BSP进行判断，判断是否包含
-          filtered_matrix=[]
-          echo "${CHANGED_FILES}"
-          if [[ -z "$CHANGED_FILES" ]]; then
-              FILTER_CONDITION='.legs[]'
-              filtered_matrix=$(jq -c "{legs: [$FILTER_CONDITION]}" <<< "$raw_matrix")
-          else
-            CONDITIONS=$(echo "$CHANGED_FILES" | awk 'BEGIN { RS="," } { printf "contains(\"%s\") or ", $1 }')
-            CONDITIONS=${CONDITIONS% or }
-
-            FILTER_CONDITION=".legs[] | select(any(.SUB_RTT_BSP[]; $CONDITIONS))"
-
-            filtered_matrix=$(jq -c "{legs: [$FILTER_CONDITION]}" <<< "$raw_matrix")
-          fi
+          git config --global http.postBuffer 524288000
+          git remote -v
+          git fetch origin
+          git branch
+          git branch -a
+          python tools/ci/git_diff_show.py origin/master
+          raw_matrix=$(cat .github/ALL_BSP_COMPILE_TEMP.json)
 
+          FILTER_CONDITION='.legs[]'
+          filtered_matrix=$(jq -c "{legs: [$FILTER_CONDITION]}" <<< "$raw_matrix")
           echo "filtered_matrix=${filtered_matrix}" >> $GITHUB_OUTPUT
-          
           echo ${filtered_matrix}
   build:
     runs-on: ubuntu-22.04

.github/workflows/git_diff_status_show.yml

@@ -6,8 +6,7 @@
 # Change Logs:
 # Date           Author       Notes
 # 2025-05-15     supperthomas add PR status show
-#
-#!/usr/bin/env python3
+# 2025-05-22     hydevcode    替换bsp_building.yml的判断文件修改机制,并将PR status show合并进bsp_building.yml
 import subprocess
 import sys
 import os
@@ -16,6 +15,8 @@
 import locale
 from typing import List, Dict
 
+import json
+from typing import List
 class FileDiff:
     def __init__(self, path: str, status: str, size_change: int = 0, old_size: int = 0, new_size: int = 0):
         self.path = path
@@ -48,7 +49,7 @@ def get_diff_files(self) -> List[FileDiff]:
             sys.exit(1)
 
         # 获取差异文件列表
-        diff_cmd = f"git diff --name-status {merge_base} "
+        diff_cmd = f"git diff --name-status {merge_base} HEAD"
         print(diff_cmd)
         try:
             output = subprocess.check_output(diff_cmd.split(), stderr=subprocess.STDOUT)
@@ -139,22 +140,128 @@ def format_size(size: int) -> str:
     else:
         return f"{size / (1024 * 1024 * 1024):.1f} GB"
 
+def is_bsp(path):
+    return os.path.isfile(os.path.join(path, "rtconfig.h"))
+
+def filter_bsp_config(file_diffs: List[FileDiff], config_path: str):
+    # 读取原始JSON配置
+    with open(config_path, 'r', encoding='utf-8') as f:
+        config = json.load(f)
+
+    # 获取所有修改的文件路径（统一使用Linux风格路径）
+    modified_paths = [diff.path.replace('\\', '/') for diff in file_diffs]
+    print(modified_paths)
+    if not modified_paths:
+        print("master分支运行")
+        return
+
+    bsp_paths = set()
+    bsp_in_but_not_bsp_paths = set()
+    all_print_paths = set()
+    for modified_path in modified_paths:
+        parts = modified_path.strip(os.sep).split('/')
+        if not parts:
+            continue
+        first_level = parts[0]
+        first_level_path = os.path.join(os.getcwd(), first_level)
+
+        #处理bsp路径的逻辑
+        if first_level == "bsp":
+            temp_path=os.path.join(os.getcwd(), modified_path)
+            # 判断是否是文件
+            if not os.path.isdir(modified_path):
+                temp_path = os.path.dirname(temp_path)
+
+            #循环搜索每一级是否有rtconfig.h
+            while temp_path !=first_level_path:
+                if is_bsp(temp_path):
+                    bsp_paths.add(temp_path)
+        
+                    break
+                temp_path=os.path.dirname(temp_path)
+
+            if temp_path ==first_level_path:
+                bsp_in_but_not_bsp_paths.add(parts[1])
+
+        else:
+            #非bsp路径逻辑
+            all_print_paths.add(first_level_path)
+
+    # 变成相对路径
+    bsp_list = set()
+    for path in sorted(bsp_paths):
+        current_working_dir = os.path.join(os.getcwd(), "bsp/")
+        if path.startswith(current_working_dir):
+            bsp_list.add(path[len(current_working_dir):].lstrip(os.sep))
+        else:
+            bsp_list.add(path)  # 如果 first_level_path 不以 current_working_dir 开头，则保持不变
+
+    # 处理修改了bsp外的文件的情况
+    filtered_bsp = [
+        path for path in bsp_list
+        if path.split('/')[0] not in bsp_in_but_not_bsp_paths
+    ]
+
+    merged_result = filtered_bsp + list(bsp_in_but_not_bsp_paths)
+
+    filtered_legs = []
+    for leg in config["legs"]:
+        matched_paths = [
+            path for path in leg.get("SUB_RTT_BSP", [])
+            if any(keyword in path for keyword in merged_result)
+        ]
+        if matched_paths:
+            filtered_legs.append({**leg, "SUB_RTT_BSP": matched_paths})
+
+    # 生成新的配置
+    new_config = {"legs": filtered_legs}
+
+    # 判断有没有修改到bsp外的文件，有的话则编译全部
+    if not all_print_paths:
+        print(new_config)
+        file_name = ".github/ALL_BSP_COMPILE_TEMP.json"
+
+        # 将 new_config 写入文件
+        with open(file_name, "w", encoding="utf-8") as file:
+            json.dump(new_config, file, ensure_ascii=False, indent=4)
+
+
 def main():
+        # 源文件路径
+    source_file = ".github/ALL_BSP_COMPILE.json"  # 替换为你的文件路径
+
+    # 目标文件路径
+    target_file = ".github/ALL_BSP_COMPILE_TEMP.json"  # 替换为你的目标文件路径
+
+    # 读取源文件并过滤掉带有 // 的行
+    with open(source_file, "r", encoding="utf-8") as infile, open(target_file, "w", encoding="utf-8") as outfile:
+        for line in infile:
+            if not line.lstrip().startswith("//"):
+                outfile.write(line)
+    
     parser = argparse.ArgumentParser(description='Compare current branch with target branch and show file differences.')
     parser.add_argument('target_branch', help='Target branch to compare against (e.g., master)')
     args = parser.parse_args()
 
     analyzer = GitDiffAnalyzer(args.target_branch)
     file_diffs = analyzer.get_diff_files()
-    
+
     # 生成报告
     generate_report(file_diffs, args.target_branch)
+
+    filter_bsp_config(file_diffs,".github/ALL_BSP_COMPILE_TEMP.json")
+
 
+def add_summary(text):
+    """
+    add summary to github action.
+    """
+    os.system(f'echo "{text}" >> $GITHUB_STEP_SUMMARY ;')
 
-        
 def generate_report(file_diffs: List[FileDiff], target_branch: str):
     """生成差异报告"""
-    print(f"\n=== Comparison between {target_branch} and current branch ===\n")
+
+    add_summary(f"\n=== Comparison between {target_branch} and current branch ===\n")
 
     # 分类统计
     added_files = [f for f in file_diffs if f.status == 'A']
@@ -169,33 +276,34 @@ def generate_report(file_diffs: List[FileDiff], target_branch: str):
     # 计算总的大小变化
     total_size_change = sum(f.size_change for f in file_diffs)
 
-    print(f"Total changes: {len(file_diffs)} files")
-    print(f"Added: {len(added_files)} files ({format_size(total_added)})")
-    print(f"Removed: {len(removed_files)} files ({format_size(total_removed)})")
-    print(f"Modified: {len(modified_files)} files ({format_size(total_modified)})")
-    print(f"Renamed: {len(renamed_files)} files")
-    print(f"\nTotal size change: {format_size(total_size_change)}")
-    print("\n" + "="*60 + "\n")
+
+    add_summary(f"  Total changes: {len(file_diffs)} files")
+    add_summary(f"  Added: {len(added_files)} files ({format_size(total_added)})")
+    add_summary(f"  Removed: {len(removed_files)} files ({format_size(total_removed)})")
+    add_summary(f"  Modified: {len(modified_files)} files ({format_size(total_modified)})")
+    add_summary(f"  Renamed: {len(renamed_files)} files")
+    add_summary(f"\n  Total size change: {format_size(total_size_change)}")
+    add_summary("\n" + "="*60 + "\n")
 
     # 显示详细差异
     for diff in file_diffs:
-        print(diff)
+        add_summary(diff)
 
         # 详细展示修改和新增的文件大小
         if diff.status == 'A':
-            print(f"  Size: {format_size(diff.new_size)}")
+            add_summary(f"Size: {format_size(diff.new_size)}")
         elif diff.status == 'M':
-            print(f"  Original size: {format_size(diff.old_size)}")
-            print(f"  New size: {format_size(diff.new_size)}")
-            print(f"  Size change: {format_size(abs(diff.size_change))}")
+            add_summary(f"Original size: {format_size(diff.old_size)}")
+            add_summary(f"New size: {format_size(diff.new_size)}")
+            add_summary(f"Size change: {format_size(abs(diff.size_change))}")
         elif diff.status == 'R':
-            print(f"  Original size: {format_size(diff.old_size)}")
-            print(f"  New size: {format_size(diff.new_size)}")
-            print(f"  Size change: {format_size(abs(diff.size_change))}")
+            add_summary(f"Original size: {format_size(diff.old_size)}")
+            add_summary(f"New size: {format_size(diff.new_size)}")
+            add_summary(f"Size change: {format_size(abs(diff.size_change))}")
         elif diff.status == 'D':
-            print(f"  Original size: {format_size(diff.old_size)}")
+            add_summary(f"Original size: {format_size(diff.old_size)}")
 
-        print("-" * 50)
+        add_summary("-" * 50)
 
 if __name__ == "__main__":
     main()