chore: adjust pr-comment-ci (#483)

Tencent · Aug 22, 2024 · db782df · db782df
1 parent e044f5b
commit db782df
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/.github/workflows/pr-comment-ci.yml b/.github/workflows/pr-comment-ci.yml
@@ -18,6 +18,7 @@ jobs:
           sparse-checkout: |
             .github/CODEOWNERS
           sparse-checkout-cone-mode: false
+
       - uses: actions/github-script@v7
         id: get-action
         with:
@@ -75,6 +76,11 @@ jobs:
           GH_TOKEN: ${{ secrets.PERSONAL_TOKEN }}
         run: gh pr checkout ${{ github.event.issue.number }}
 
+      - name: git config
+        run: |
+          git config --local user.email "github-actions[bot]@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
+
       - name: submodule init and sync remote
         run: |
           git submodule update --init --remote
@@ -91,8 +97,6 @@ jobs:
 
       - name: merge develop
         run: |
-          git config --local user.email "github-actions[bot]@users.noreply.github.com"
-          git config --local user.name "github-actions[bot]"
           git merge develop --no-commit || true
 
       - name: check conflicts
@@ -141,15 +145,21 @@ jobs:
         with:
           fetch-depth: 0
           token: ${{ secrets.PERSONAL_TOKEN }}
+
       - name: gh checkout pr
         env:
           GH_TOKEN: ${{ secrets.PERSONAL_TOKEN }}
         run: gh pr checkout ${{ github.event.issue.number }} --recurse-submodules
-      - name: merge develop
+
+      - name: git config
         run: |
           git config --local user.email "github-actions[bot]@users.noreply.github.com"
           git config --local user.name "github-actions[bot]"
+
+      - name: merge develop
+        run: |
           git merge develop --no-commit || true
+
       - name: check conflicts
         run: |
           git status
@@ -201,8 +211,11 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 18
+
       - run: npm install
+
       - run: npm run test:update
+
       - name: Commit Snapshot
         run: |
           git status
@@ -212,6 +225,7 @@ jobs:
             git commit -m "chore: update snapshot"
           fi
           git status
+ 
       - name: git push
         run: |
           git status