Skip to content

Commit cd6cae2

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into abort_requests
2 parents f98b047 + 5c60e2f commit cd6cae2

256 files changed

Lines changed: 20711 additions & 7020 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/copilot-instructions.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ submitButton.enabled = isValidEmail(user.email);
4747

4848
- Please check the title of the Pull Request. It needs to follow the format of [CLASS]Title, for example, [BugFix] Fix memory leak of data processor. If the title is incorrect, provide suggestions on how the committer should modify it.
4949
- Please check the description information of the Pull Request. At a minimum, it should explain why these modifications are being made in this Pull Request and what problem is being solved. If the committer hasn't written the corresponding information or the information is incomplete, prompt the committer to make modifications.
50+
- For all Pull Requests, please confirm whether it is necessary to add, update, or delete documentation, and remind the committer to handle it accordingly.
5051

5152
## Others
5253
- 对于所有提交的PR,你提交的评论都使用中文语言,但需要注意,代码中的注释仍然需要使用英文

.github/workflows/CheckPRTemplate.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
rm -rf * .[^.]*
2323
2424
- name: Checkout base branch
25-
uses: actions/checkout@v4
25+
uses: actions/checkout@v6
2626
with:
2727
ref: ${{ github.event.pull_request.base.ref }}
2828
fetch-depth: 1000
@@ -33,7 +33,7 @@ jobs:
3333
git checkout -b test FETCH_HEAD
3434
3535
- name: Setup Python 3.10
36-
uses: actions/setup-python@v5
36+
uses: actions/setup-python@v6
3737
with:
3838
python-version: '3.10'
3939
cache: 'pip'

.github/workflows/Codestyle-Check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
rm -rf * .[^.]*
2222
2323
- name: Checkout base repo
24-
uses: actions/checkout@v4
24+
uses: actions/checkout@v6
2525
with:
2626
ref: ${{ github.event.pull_request.base.ref }}
2727
fetch-depth: 1000
@@ -32,7 +32,7 @@ jobs:
3232
git checkout -b test FETCH_HEAD
3333
3434
- name: Setup python3.10
35-
uses: actions/setup-python@v5
35+
uses: actions/setup-python@v6
3636
with:
3737
python-version: '3.10'
3838
cache: 'pip'

.github/workflows/_base_test.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,22 @@ on:
2727
required: false
2828
type: string
2929
default: ""
30+
secrets:
31+
github-token:
32+
required: true
3033

3134
jobs:
35+
check_bypass:
36+
uses: ./.github/workflows/check-bypass.yml
37+
secrets:
38+
github-token: ${{ secrets.github-token }}
39+
with:
40+
workflow-name: base_test
41+
3242
base_tests:
3343
runs-on: [self-hosted, GPU-h20-1Cards]
44+
needs: check_bypass
45+
if: ${{ inputs.FASTDEPLOY_WHEEL_URL != '' && needs.check_bypass.outputs.can-skip != 'true' }}
3446
timeout-minutes: 60
3547
steps:
3648
- name: Code Prepare

.github/workflows/_build_linux.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,22 @@ on:
5757
wheel_path:
5858
description: "Output path of the generated wheel"
5959
value: ${{ jobs.fd-build.outputs.wheel_path }}
60+
secrets:
61+
github-token:
62+
required: true
63+
6064
jobs:
65+
check_bypass:
66+
uses: ./.github/workflows/check-bypass.yml
67+
secrets:
68+
github-token: ${{ secrets.github-token }}
69+
with:
70+
workflow-name: build_gpu
71+
6172
fd-build:
6273
runs-on: [self-hosted, GPU-Build]
74+
needs: check_bypass
75+
if: ${{ needs.check_bypass.outputs.can-skip != 'true' }}
6376
timeout-minutes: 360
6477
outputs:
6578
wheel_path: ${{ steps.set_output.outputs.wheel_path }}

.github/workflows/_build_xpu.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,22 @@ on:
3636
wheel_path:
3737
description: "Output path of the generated wheel"
3838
value: ${{ jobs.xpu-build-test.outputs.wheel_path }}
39+
secrets:
40+
github-token:
41+
required: true
42+
3943
jobs:
44+
check_bypass:
45+
uses: ./.github/workflows/check-bypass.yml
46+
secrets:
47+
github-token: ${{ secrets.github-token }}
48+
with:
49+
workflow-name: build_xpu
50+
4051
xpu-build-test:
4152
runs-on: [self-hosted, XPU-P800]
53+
needs: check_bypass
54+
if: ${{ needs.check_bypass.outputs.can-skip != 'true' }}
4255
outputs:
4356
wheel_path: ${{ steps.set_output.outputs.wheel_path }}
4457
steps:

.github/workflows/_clone_linux.yml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,28 @@ on:
1212
repo_archive_url:
1313
description: "Compressed source code archive."
1414
value: ${{ jobs.code-clone.outputs.repo_archive_url }}
15+
secrets:
16+
github-token:
17+
required: true
18+
1519
jobs:
20+
check_bypass:
21+
uses: ./.github/workflows/check-bypass.yml
22+
secrets:
23+
github-token: ${{ secrets.github-token }}
24+
with:
25+
workflow-name: code_clone
26+
1627
code-clone:
1728
runs-on:
1829
group: HK-Clone
30+
needs: check_bypass
31+
if: ${{ needs.check_bypass.outputs.can-skip != 'true' }}
1932
outputs:
2033
repo_archive_url: ${{ steps.set_output.outputs.repo_archive_url }}
2134
steps:
2235
- name: Clone FastDeploy
23-
uses: actions/checkout@v4
36+
uses: actions/checkout@v6
2437
with:
2538
ref: ${{ github.event_name == 'pull_request'
2639
&& github.event.pull_request.base.ref
@@ -38,7 +51,7 @@ jobs:
3851
git merge --no-ff pr/${{ github.event.pull_request.number }}
3952
echo "PR Branch log "
4053
git log --oneline -n 5 pr/${{ github.event.pull_request.number }}
41-
- uses: actions/setup-python@v5
54+
- uses: actions/setup-python@v6
4255
with:
4356
python-version: '3.10'
4457
- name: Code Info Show and Upload
@@ -47,8 +60,6 @@ jobs:
4760
AK: paddle
4861
SK: paddle
4962
run: |
50-
git config --unset http.https://github.com/.extraheader
51-
git submodule foreach --recursive sh -c "git config --local --unset-all 'http.https://github.com/.extraheader'"
5263
git submodule foreach --recursive sh -c "git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'"
5364
echo "Current HEAD Log:"
5465
git log --oneline -n 5

.github/workflows/_gpu_4cards_case_test.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,17 @@ on:
3232
required: true
3333

3434
jobs:
35+
check_bypass:
36+
uses: ./.github/workflows/check-bypass.yml
37+
secrets:
38+
github-token: ${{ secrets.github-token }}
39+
with:
40+
workflow-name: gpu_4cards_test
41+
3542
run_4_cards_tests:
3643
runs-on: [self-hosted, GPU-h20-4Cards]
44+
needs: check_bypass
45+
if: ${{ inputs.FASTDEPLOY_WHEEL_URL != '' && needs.check_bypass.outputs.can-skip != 'true' }}
3746
timeout-minutes: 30
3847
steps:
3948
- name: Code Prepare

.github/workflows/_iluvatar_cases.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,22 @@ on:
2222
required: false
2323
type: string
2424
default: ""
25+
secrets:
26+
github-token:
27+
required: true
2528

2629
jobs:
30+
check_bypass:
31+
uses: ./.github/workflows/check-bypass.yml
32+
secrets:
33+
github-token: ${{ secrets.github-token }}
34+
with:
35+
workflow-name: ci_iluvatar
36+
2737
run_iluvatar_cases:
2838
runs-on: iluvatar-gpu-2
39+
needs: check_bypass
40+
if: ${{ needs.check_bypass.outputs.can-skip != 'true' }}
2941
timeout-minutes: 60
3042
container:
3143
image: ${{ inputs.DOCKER_IMAGE }}

.github/workflows/_logprob_test_linux.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,22 @@ on:
2828
required: false
2929
type: string
3030
default: ""
31+
secrets:
32+
github-token:
33+
required: true
3134

3235
jobs:
36+
check_bypass:
37+
uses: ./.github/workflows/check-bypass.yml
38+
secrets:
39+
github-token: ${{ secrets.github-token }}
40+
with:
41+
workflow-name: logprob_test
42+
3343
run_tests_logprob:
3444
runs-on: [self-hosted, GPU-h20-1Cards]
45+
needs: check_bypass
46+
if: ${{ inputs.FASTDEPLOY_WHEEL_URL != '' && needs.check_bypass.outputs.can-skip != 'true' }}
3547
timeout-minutes: 60
3648
steps:
3749
- name: Code Prepare

0 commit comments

Comments
 (0)