Update pr_clang_format.yml

Author: Nedki-L

.github/workflows/pr_clang_format.yml

@@ -27,7 +27,7 @@ permissions:
 jobs:
   format-code:
     if: |
-      github.repository_owner != 'RT-Thread'
+      github.repository_owner != 'Nedki-L'
     runs-on: ubuntu-latest
 
     steps:
@@ -52,37 +52,55 @@ jobs:
           echo "📋 Checking supported features..."
           clang-format --help | grep -i "align\|consecutive" || echo "No align/consecutive options found"
 
-      - name: Get changed files from PR
-        id: get-pr-files
+      - name: Get PR info (files and author)
+        id: get-pr-info
         run: |
           max_retries=3
           retry_count=0
           changed_files=""
           api_response=""
-          
+
           # 获取PR编号（workflow_dispatch时需要手动输入）
           PR_NUMBER="${{ github.event.inputs.pr_number }}"
-          
+
           if [ -z "$PR_NUMBER" ]; then
             echo "Error: PR number is required"
             exit 1
           fi
-          
+
+          echo "Fetching PR info for #$PR_NUMBER..."
+
+          # 获取PR的详细信息（包括作者）
+          pr_response=$(curl -s \
+            -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
+            -H "Accept: application/vnd.github.v3+json" \
+            "https://api.github.com/repos/RT-Thread/rt-thread/pulls/$PR_NUMBER")
+
+          # 获取PR作者的GitHub用户名
+          PR_AUTHOR=$(jq -r '.user.login' <<<"$pr_response")
+          echo "PR Author: $PR_AUTHOR"
+
+          # 使用GitHub noreply邮箱格式
+          PR_AUTHOR_EMAIL="${PR_AUTHOR}+github[bot]@noreply.github.com"
+
+          echo "pr_author=$PR_AUTHOR" >> $GITHUB_OUTPUT
+          echo "pr_author_email=$PR_AUTHOR_EMAIL" >> $GITHUB_OUTPUT
+
           echo "Fetching changed files for PR #$PR_NUMBER..."
-          
+
           while [ $retry_count -lt $max_retries ]; do
             # 使用一个curl调用同时获取响应内容和状态码
             api_response=$(curl -s -w "\n%{http_code}" \
               -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
               -H "Accept: application/vnd.github.v3+json" \
               "https://api.github.com/repos/RT-Thread/rt-thread/pulls/$PR_NUMBER/files")
-            
+
             # 分离HTTP状态码和响应内容
             http_status=$(echo "$api_response" | tail -1)
             api_response=$(echo "$api_response" | sed '$d')
-            
+
             echo "HTTP Status: $http_status"
-            
+
             # 检查HTTP状态码
             if [ "$http_status" -ne 200 ]; then
               echo "Retry $((retry_count+1)): HTTP $http_status - API response error"
@@ -91,7 +109,7 @@ jobs:
               ((retry_count++))
               continue
             fi
-            
+
             # 验证响应是否为有效JSON且包含文件数组
             if jq -e 'if type=="array" then .[0].filename else empty end' <<<"$api_response" >/dev/null 2>&1; then
               changed_files=$(jq -r '.[].filename' <<<"$api_response")
@@ -103,18 +121,18 @@ jobs:
               ((retry_count++))
             fi
           done
-          
+
           if [ -z "$changed_files" ]; then
             echo "Error: Failed to get changed files after $max_retries attempts"
             echo "Final API Response: $api_response"
             exit 1
           fi
-          
+
           # 将文件列表转换为逗号分隔格式
           changed_files_comma=$(echo "$changed_files" | tr '\n' ',' | sed 's/,$//')
-          
+
           echo "Successfully fetched $(echo "$changed_files" | wc -l) changed files"
-          
+
           # 设置输出
           echo "all_changed_files=$changed_files_comma" >> $GITHUB_OUTPUT
           echo "changed_files_count=$(echo "$changed_files" | wc -l)" >> $GITHUB_OUTPUT
@@ -123,7 +141,7 @@ jobs:
         id: find-files
         run: |
           # 获取PR中修改的文件
-          CHANGED_FILES="${{ steps.get-pr-files.outputs.all_changed_files }}"
+          CHANGED_FILES="${{ steps.get-pr-info.outputs.all_changed_files }}"
           
           # 将逗号分隔的文件列表转换为换行分隔
           CHANGED_FILES_LINES=$(echo "$CHANGED_FILES" | tr ',' '\n')
@@ -215,24 +233,46 @@ jobs:
         run: |
           echo "开始格式化代码..."
           FILES="${{ steps.find-files.outputs.files_list }}"
-          
+          ROOT_DIR="$(pwd)"
+          CLANG_FORMAT_CONFIG="$ROOT_DIR/.clang-format"
+
+          # 检查根目录的 .clang-format 是否存在
+          if [ ! -f "$CLANG_FORMAT_CONFIG" ]; then
+            echo "❌ 错误: 根目录找不到 .clang-format 配置文件"
+            exit 1
+          fi
+
+          echo "📋 使用配置文件: $CLANG_FORMAT_CONFIG"
+
+          # 注意: clang-format 会自动查找 .clang-format-ignore 文件
+          # 它会在被格式化文件的当前目录及父目录中查找
+          # 如果fork仓库中包含 .clang-format-ignore 文件，忽略规则会自动生效
+
           # 使用clang-format批量格式化文件
-          echo "$FILES" | xargs -I {} sh -c '
-            file="{}"
-            if [ -f "$file" ]; then
+          # 使用 -style=llvm 配合 --clang-format-config 明确指定配置文件
+          # 这确保深路径文件也使用根目录的 .clang-format 而不是子目录的
+          format_error=0
+
+          while IFS= read -r file; do
+            if [ -n "$file" ] && [ -f "$file" ]; then
               echo "📝 格式化: $file"
-              clang-format -style=file -i "$file"
-              if [ $? -eq 0 ]; then
-                echo "✅ 格式化成功: $file"
-              else
+              # 使用 --style=llvm 配合 --clang-format-config 指定根目录的配置文件
+              # 这样可以避免 clang-format 查找子目录的 .clang-format
+              if ! clang-format --style=llvm --clang-format-config="$CLANG_FORMAT_CONFIG" -i "$file"; then
                 echo "❌ 格式化失败: $file"
-                exit 1
+                format_error=1
+                break
               fi
+              echo "✅ 格式化成功: $file"
             else
-              echo "⚠️  文件不存在: $file"
+              echo "⚠️  文件不存在或跳过: $file"
             fi
-          '
-          
+          done <<< "$FILES"
+
+          if [ $format_error -ne 0 ]; then
+            exit 1
+          fi
+
           echo "✅ 代码格式化完成"
           
       - name: Check for changes
@@ -250,13 +290,22 @@ jobs:
       - name: Commit and push changes
         if: steps.check-changes.outputs.has_changes == 'true'
         run: |
-          git config --local user.email "github-actions[bot]@users.noreply.github.com"
-          git config --local user.name "github-actions[bot]"
-          
+          # 使用PR作者作为commit author，避免CLA检查失败
+          # CLA检查只识别PR作者（已签署CLA），而不识别github-actions[bot]
+          PR_AUTHOR="${{ steps.get-pr-info.outputs.pr_author }}"
+          PR_AUTHOR_EMAIL="${{ steps.get-pr-info.outputs.pr_author_email }}"
+
+          git config --local user.email "$PR_AUTHOR_EMAIL"
+          git config --local user.name "$PR_AUTHOR"
+
+          # 使用GIT_AUTHOR环境变量让commit以贡献者名义提交
+          export GIT_AUTHOR_NAME="$PR_AUTHOR"
+          export GIT_AUTHOR_EMAIL="$PR_AUTHOR_EMAIL"
+
           git add -A
           git commit -m "style: format code with clang-format [skip ci]"
           git push origin HEAD:${{ github.event.inputs.branch }}
-          
+
           echo "✅ 代码格式化完成并已推送到分支 ${{ github.event.inputs.branch }}"
           
       - name: Summary
@@ -266,4 +315,4 @@ jobs:
           echo "排除模式: ${{ github.event.inputs.exclude_patterns || '无' }}"
           echo "处理文件数: ${{ steps.find-files.outputs.files_count }}"
           echo "有更改: ${{ steps.check-changes.outputs.has_changes }}"
-          echo "clang-format 版本: $(clang-format --version | head -1)"
+          echo "clang-format 版本: $(clang-format --version | head -1)"