Refine: skip pr-test for dts-only changes (cocos#649)

Author: bofeng-song

.github/workflows/check-dts.yml

@@ -52,37 +52,48 @@ jobs:
             exit 0
           fi
 
-          GREP_FILTER='grep -v "^---" | grep -v "^-exports\[" | grep -v "^-$" | grep -v "^\-[[:space:]]*$" | grep -v "^\-\`;$"'
+          # Detect truly removed API lines by comparing deleted vs added lines.
+          # Lines that appear in both deleted and added sets are modifications or
+          # snapshot reorganizations (due to index.d.ts duplication), not removals.
+          # Only lines present in deleted but NOT in added are real breaking changes.
+          extract_truly_deleted() {
+            local diff_output="$1"
+            local noise_filter='grep -v "^exports\[" | grep -v "^$" | grep -v "^[[:space:]]*$" | grep -v "^\`;" | grep -v "^[[:space:]]*}[;,]\?$" | grep -v "^export { }$" | grep -v "^[[:space:]]*static readonly version" | grep -v "^export { .*_[0-9]\+ as "'
+
+            # Extract deleted lines (strip leading -, normalize quotes and Object casing)
+            local deleted
+            deleted=$(echo "$diff_output" | grep '^-' | grep -v '^---' | sed 's/^-//' \
+              | eval "$noise_filter" | sed "s/\"/'/g; s/\bObject\b/object/g" | sort -u || true)
+
+            # Extract added lines (strip leading +, normalize quotes and Object casing)
+            local added
+            added=$(echo "$diff_output" | grep '^+' | grep -v '^+++' | sed 's/^+//' \
+              | eval "$noise_filter" | sed "s/\"/'/g; s/\bObject\b/object/g" | sort -u || true)
+
+            # Lines in deleted but NOT in added = truly removed
+            if [ -n "$deleted" ]; then
+              comm -23 <(echo "$deleted") <(echo "$added") || true
+            fi
+          }
 
           # 1) Committed snapshot changes (BASE...HEAD)
-          COMMITTED_DELETED=""
+          COMMITTED_REMOVED=""
           if git diff --name-only "$BASE_REF"...HEAD | grep -q "$SNAP_FILE"; then
-            COMMITTED_DELETED=$(git diff "$BASE_REF"...HEAD -- "$SNAP_FILE" \
-              | grep '^-' \
-              | grep -v '^---' \
-              | grep -v '^-exports\[' \
-              | grep -v '^-$' \
-              | grep -v '^\-[[:space:]]*$' \
-              | grep -v '^\-`;$' \
-              || true)
+            DIFF_OUTPUT=$(git diff "$BASE_REF"...HEAD -- "$SNAP_FILE")
+            COMMITTED_REMOVED=$(extract_truly_deleted "$DIFF_OUTPUT")
           fi
 
           # 2) Uncommitted snapshot changes: the -u step regenerated the snapshot
           #    from current code; diff HEAD vs working tree catches type changes
           #    that were not committed as snapshot updates.
-          UNCOMMITTED_DELETED=""
+          UNCOMMITTED_REMOVED=""
           if ! git diff --quiet HEAD -- "$SNAP_FILE" 2>/dev/null; then
-            UNCOMMITTED_DELETED=$(git diff HEAD -- "$SNAP_FILE" \
-              | grep '^-' \
-              | grep -v '^---' \
-              | grep -v '^-exports\[' \
-              | grep -v '^-$' \
-              | grep -v '^\-[[:space:]]*$' \
-              | grep -v '^\-`;$' \
-              || true)
+            DIFF_OUTPUT=$(git diff HEAD -- "$SNAP_FILE")
+            UNCOMMITTED_REMOVED=$(extract_truly_deleted "$DIFF_OUTPUT")
           fi
 
-          DELETED_LINES="${COMMITTED_DELETED}${UNCOMMITTED_DELETED}"
+          # Merge and deduplicate across both sources
+          DELETED_LINES=$(printf '%s\n%s' "$COMMITTED_REMOVED" "$UNCOMMITTED_REMOVED" | grep -v '^$' | sort -u || true)
 
           if [ -z "$DELETED_LINES" ]; then
             echo "No DTS API breaking changes detected."

.github/workflows/pr-test.yml

@@ -7,14 +7,57 @@ on:
     types: [created]
 
 jobs:
-  pr-test:
-    # 运行条件：
-    # 1. PR 事件
-    # 2. 评论触发 (包含 "rerun pr test"，包括 "rerun pr test:debug")
+  check-changes:
+    # 检查是否有需要运行 pr-test 的文件变更
     if: |
       github.event_name == 'pull_request' ||
       (github.event_name == 'issue_comment' && github.event.issue.pull_request && contains(github.event.comment.body, 'rerun pr test'))
-    
+    runs-on: ubuntu-latest
+    outputs:
+      should_run: ${{ steps.filter.outputs.should_run }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: ${{ github.event_name == 'issue_comment' && github.event.issue.pull_request && format('refs/pull/{0}/head', github.event.issue.number) || github.ref }}
+
+      - name: Check changed files
+        id: filter
+        shell: bash
+        run: |
+          # 评论触发时始终运行
+          if [ "${{ github.event_name }}" = "issue_comment" ]; then
+            echo "should_run=true" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+
+          BASE_REF="origin/${{ github.base_ref }}"
+          CHANGED_FILES=$(git diff --name-only "$BASE_REF"...HEAD)
+
+          # 仅 dts/snapshot 相关文件变更时跳过 pr-test
+          DTS_ONLY=true
+          while IFS= read -r file; do
+            case "$file" in
+              .github/workflows/check-dts.yml|\
+              .github/workflows/publish-dts.yml|\
+              packages/cocos-cli-types/*|\
+              packages/cocos-cli-types/**/*) ;;
+              *) DTS_ONLY=false; break ;;
+            esac
+          done <<< "$CHANGED_FILES"
+
+          if [ "$DTS_ONLY" = "true" ]; then
+            echo "Only dts-related files changed, skipping pr-test."
+            echo "should_run=false" >> "$GITHUB_OUTPUT"
+          else
+            echo "should_run=true" >> "$GITHUB_OUTPUT"
+          fi
+
+  pr-test:
+    needs: check-changes
+    if: needs.check-changes.outputs.should_run == 'true'
+
     strategy:
       matrix:
         # Windows native build still uses the bundled CMake 3.24.3 and VS2022 generator.