From ec80b87f6a7c380ea20bdc916aa10b034cbabdad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A2=A8=E6=A2=93=E6=9F=92?= <1787882683@qq.com>
Date: Sun, 13 Jul 2025 18:06:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81=E4=BB=A5=E4=BD=BF=E7=94=A8=E8=87=AA=E6=89=98=E7=AE=A1?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=B9=B6=E4=BC=98=E5=8C=96=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E5=92=8CRuff=E6=A3=80=E6=9F=A5=E6=AD=A5?=
 =?UTF-8?q?=E9=AA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/precheck.yml | 27 +++++++++++++++++++--------
 .github/workflows/ruff-pr.yml  | 18 +++++++++++++++---
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/precheck.yml b/.github/workflows/precheck.yml
index a7524ccb3..d7264c703 100644
--- a/.github/workflows/precheck.yml
+++ b/.github/workflows/precheck.yml
@@ -4,21 +4,32 @@ on: [pull_request]
 
 jobs:
   conflict-check:
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
+    outputs:
+      conflict: ${{ steps.check-conflicts.outputs.conflict }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Check Conflicts
+        id: check-conflicts
         run: |
           git fetch origin main
-          if git diff --name-only --diff-filter=U origin/main...HEAD | grep .; then
-            echo "CONFLICT=true" >> $GITHUB_ENV
-          fi
+          $conflicts = git diff --name-only --diff-filter=U origin/main...HEAD
+          if ($conflicts) {
+            echo "conflict=true" >> $env:GITHUB_OUTPUT
+            Write-Host "Conflicts detected in files: $conflicts"
+          } else {
+            echo "conflict=false" >> $env:GITHUB_OUTPUT
+            Write-Host "No conflicts detected"
+          }
+        shell: pwsh
   labeler:
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     needs: conflict-check
+    if: needs.conflict-check.outputs.conflict == 'true'
     steps:
-      - uses: actions/github-script@v6
-        if: env.CONFLICT == 'true'
+      - uses: actions/github-script@v7
         with:
           script: |
             github.rest.issues.addLabels({
diff --git a/.github/workflows/ruff-pr.yml b/.github/workflows/ruff-pr.yml
index bb83de8c9..552efbb89 100644
--- a/.github/workflows/ruff-pr.yml
+++ b/.github/workflows/ruff-pr.yml
@@ -1,9 +1,21 @@
-name: Ruff
+name: Ruff PR Check
 on: [ pull_request ]
 jobs:
   ruff:
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
       - uses: actions/checkout@v4
-      - uses: astral-sh/ruff-action@v3
+        with:
+          fetch-depth: 0
+      - name: Install Ruff and Run Checks
+        uses: astral-sh/ruff-action@v3
+        with:
+          args: "--version"
+          version: "latest"
+      - name: Run Ruff Check (No Fix)
+        run: ruff check --output-format=github
+        shell: pwsh
+      - name: Run Ruff Format Check
+        run: ruff format --check --diff
+        shell: pwsh