Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix win test #360

Merged
merged 1 commit into from
Nov 25, 2024
Merged

fix win test #360

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .github/workflows/win_test.yml
View file
Open in desktop
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
Loading