From 425b0e5bc6ae3f005ecf6e5b9002020712129992 Mon Sep 17 00:00:00 2001
From: lwj-st <109193776+lwj-st@users.noreply.github.com>
Date: Mon, 25 Nov 2024 13:47:25 +0800
Subject: [PATCH] fix win test (#360)

---
 .github/workflows/win_test.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/win_test.yml b/.github/workflows/win_test.yml
index 9246d4b3..809c13fc 100644
--- a/.github/workflows/win_test.yml
+++ b/.github/workflows/win_test.yml
@@ -29,6 +29,7 @@ jobs:
           fetch-depth: 0
           
       - name: Fetch PR source branch
+        shell: bash
         if: github.event_name == 'pull_request_target'
         run: |
           if [ "${{ github.event.pull_request.head.repo.full_name }}" != "${{ github.repository }}" ]; then
@@ -42,8 +43,11 @@ jobs:
           fi
           
       - name: Merge PR branch into main
+        shell: bash
         if: github.event_name == 'pull_request_target'
         run: |
+          git config user.name "GitHub Actions Bot"
+          git config user.email "actions@github.com"
           git checkout main
           git merge --no-ff pr_branch
           git submodule update --init
@@ -116,6 +120,7 @@ jobs:
           fetch-depth: 0
 
       - name: Merge PR branch into main
+        shell: bash
         if: github.event_name == 'pull_request_target'
         run: |
           if [ "${{ github.event.pull_request.head.repo.full_name }}" != "${{ github.repository }}" ]; then
@@ -129,9 +134,11 @@ jobs:
           fi
           
       - name: Merge PR branch into main
-        if: github.event_name == 'pull_request_target'
         shell: bash
+        if: github.event_name == 'pull_request_target'
         run: |
+          git config user.name "GitHub Actions Bot"
+          git config user.email "actions@github.com"
           git checkout main
           git merge --no-ff pr_branch 
           git submodule update --init
@@ -183,4 +190,4 @@ jobs:
          LAZYLLM_SENSENOVA_SECRET_KEY: ${{ secrets.LAZYLLM_SENSENOVA_SECRET_KEY }}
          LAZYLLM_PostgreSQL_URL: ${{ secrets.LAZYLLM_PostgreSQL_URL }}
          GITHUB_TOKEN: ${{ secrets.PERSONAL_GITHUB_TOKEN }}
-        timeout-minutes: 30
+        timeout-minutes: 30
\ No newline at end of file