Skip to content

Commit

Permalink
fix win test (#360)
Browse files Browse the repository at this point in the history
  • Loading branch information
lwj-st authored Nov 25, 2024
1 parent b2d86e0 commit 425b0e5
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions .github/workflows/win_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 "[email protected]"
git checkout main
git merge --no-ff pr_branch
git submodule update --init
Expand Down Expand Up @@ -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
Expand All @@ -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 "[email protected]"
git checkout main
git merge --no-ff pr_branch
git submodule update --init
Expand Down Expand Up @@ -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

0 comments on commit 425b0e5

Please sign in to comment.