Skip to content

Commit def2c4d

Browse files
doitiandoitian
authored
Merge branch 'rc/v0.108.x' into quake/full-match-mode
2 parents f29ff56 + 097b926 commit def2c4d

File tree

91 files changed

+680
-701
lines changed

Some content is hidden

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

91 files changed

+680
-701
lines changed

‎.github/actions/ci_prologue/ci_prologue.sh

+5
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,11 @@ if [[ $GITHUB_EVENT_NAME == "push" ]];then
8585
MESSAGE="$COMMIT_MESSAGE"
8686
fun_pasing_message "$MESSAGE"
8787
fi
88+
if [[ $GITHUB_EVENT_NAME == "merge_group" ]];then
89+
# Do not customize running settings for merge queue
90+
MESSAGE=
91+
fun_pasing_message "$MESSAGE"
92+
fi
8893
if [[ $GITHUB_EVENT_NAME == "pull_request" ]];then
8994
MESSAGE="$PR_COMMONS_BODY"
9095
actor_permission=`curl -H "Authorization: Bearer $GITHUB_TOKEN" https://api.github.com/repos/$GITHUB_REPOSITORY/collaborators/$GITHUB_ACTOR/permission |jq .permission | sed 's/\"//g'`

‎.github/workflows/ci_aarch64_build_ubuntu.yaml

+2-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ on:
99
branches:
1010
- master
1111
- develop
12-
- trying
13-
- staging
1412
- 'rc/*'
15-
13+
merge_group: {}
1614

1715
env:
1816
CARGO_TERM_COLOR: always
@@ -37,7 +35,7 @@ jobs:
3735
PR_COMMONS_BODY: "${{ github.event.pull_request.body }}"
3836
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
3937
LABELS: "${{ toJson(github.event.pull_request.labels.*.name) }}"
40-
GITHUB_REPOSITORY: ${{ github.repositoty }}
38+
GITHUB_REPOSITORY: ${{ github.repository }}
4139
GITHUB_WORKFLOW: ${{ github.workflow }}
4240
ci_aarch64_build_ubuntu:
4341
name: ci_aarch64_build_ubuntu

‎.github/workflows/ci_benchmarks_macos.yaml

+4-5
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ on:
99
branches:
1010
- master
1111
- develop
12-
- trying
13-
- staging
1412
- 'rc/*'
13+
merge_group: {}
14+
1515
env:
1616
CARGO_TERM_COLOR: always
1717
RUST_BACKTRACE: full
@@ -23,8 +23,7 @@ jobs:
2323
github.event_name != 'push' ||
2424
( github.event_name == 'push' &&
2525
( github.ref == 'refs/heads/master' ||
26-
github.ref == 'refs/heads/trying' ||
27-
github.ref == 'refs/heads/staging' ||
26+
github.ref == 'refs/heads/gh-readonly-queue/develop' ||
2827
(github.ref == 'refs/heads/develop' && github.event.head_commit.author.name != 'bors[bot]') ||
2928
startsWith(github.ref, 'refs/heads/rc/')
3029
)
@@ -45,7 +44,7 @@ jobs:
4544
PR_COMMONS_BODY: "${{ github.event.pull_request.body }}"
4645
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
4746
LABELS: "${{ toJson(github.event.pull_request.labels.*.name) }}"
48-
GITHUB_REPOSITORY: ${{ github.repositoty }}
47+
GITHUB_REPOSITORY: ${{ github.repository }}
4948
GITHUB_WORKFLOW: ${{ github.workflow }}
5049
ci_benchmarks_macos:
5150
name: ci_benchmarks_macos

‎.github/workflows/ci_benchmarks_ubuntu.yaml

+3-5
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ on:
99
branches:
1010
- master
1111
- develop
12-
- trying
13-
- staging
1412
- 'rc/*'
13+
merge_group: {}
1514
env:
1615
CARGO_TERM_COLOR: always
1716
RUST_BACKTRACE: full
@@ -23,8 +22,7 @@ jobs:
2322
github.event_name != 'push' ||
2423
( github.event_name == 'push' &&
2524
( github.ref == 'refs/heads/master' ||
26-
github.ref == 'refs/heads/trying' ||
27-
github.ref == 'refs/heads/staging' ||
25+
github.ref == 'refs/heads/gh-readonly-queue/develop' ||
2826
(github.ref == 'refs/heads/develop' && github.event.head_commit.author.name != 'bors[bot]') ||
2927
startsWith(github.ref, 'refs/heads/rc/')
3028
)
@@ -45,7 +43,7 @@ jobs:
4543
PR_COMMONS_BODY: "${{ github.event.pull_request.body }}"
4644
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
4745
LABELS: "${{ toJson(github.event.pull_request.labels.*.name) }}"
48-
GITHUB_REPOSITORY: ${{ github.repositoty }}
46+
GITHUB_REPOSITORY: ${{ github.repository }}
4947
GITHUB_WORKFLOW: ${{ github.workflow }}
5048
ci_benchmarks_ubuntu:
5149
name: ci_benchmarks_ubuntu

‎.github/workflows/ci_benchmarks_windows.yaml

+4-5
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ on:
99
branches:
1010
- master
1111
- develop
12-
- trying
13-
- staging
1412
- 'rc/*'
13+
merge_group: {}
14+
1515
env:
1616
CARGO_TERM_COLOR: always
1717
RUST_BACKTRACE: full
@@ -23,8 +23,7 @@ jobs:
2323
github.event_name != 'push' ||
2424
( github.event_name == 'push' &&
2525
( github.ref == 'refs/heads/master' ||
26-
github.ref == 'refs/heads/trying' ||
27-
github.ref == 'refs/heads/staging' ||
26+
github.ref == 'refs/heads/gh-readonly-queue/develop' ||
2827
(github.ref == 'refs/heads/develop' && github.event.head_commit.author.name != 'bors[bot]') ||
2928
startsWith(github.ref, 'refs/heads/rc/')
3029
)
@@ -45,7 +44,7 @@ jobs:
4544
PR_COMMONS_BODY: "${{ github.event.pull_request.body }}"
4645
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
4746
LABELS: "${{ toJson(github.event.pull_request.labels.*.name) }}"
48-
GITHUB_REPOSITORY: ${{ github.repositoty }}
47+
GITHUB_REPOSITORY: ${{ github.repository }}
4948
GITHUB_WORKFLOW: ${{ github.workflow }}
5049
ci_benchmarks_windows:
5150
name: ci_benchmarks_windows

‎.github/workflows/ci_cargo_deny_ubuntu.yaml

+3-5
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ on:
99
branches:
1010
- master
1111
- develop
12-
- trying
13-
- staging
1412
- 'rc/*'
13+
merge_group: {}
1514

1615

1716
env:
@@ -25,8 +24,7 @@ jobs:
2524
github.event_name != 'push' ||
2625
( github.event_name == 'push' &&
2726
( github.ref == 'refs/heads/master' ||
28-
github.ref == 'refs/heads/trying' ||
29-
github.ref == 'refs/heads/staging' ||
27+
github.ref == 'refs/heads/gh-readonly-queue/develop' ||
3028
(github.ref == 'refs/heads/develop' && github.event.head_commit.author.name != 'bors[bot]') ||
3129
startsWith(github.ref, 'refs/heads/rc/')
3230
)
@@ -47,7 +45,7 @@ jobs:
4745
PR_COMMONS_BODY: "${{ github.event.pull_request.body }}"
4846
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
4947
LABELS: "${{ toJson(github.event.pull_request.labels.*.name) }}"
50-
GITHUB_REPOSITORY: ${{ github.repositoty }}
48+
GITHUB_REPOSITORY: ${{ github.repository }}
5149
GITHUB_WORKFLOW: ${{ github.workflow }}
5250
ci_cargo_deny_ubuntu:
5351
name: ci_cargo_deny_ubuntu

‎.github/workflows/ci_integration_tests_macos.yaml

+4-5
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ on:
99
branches:
1010
- master
1111
- develop
12-
- trying
13-
- staging
1412
- 'rc/*'
13+
merge_group: {}
14+
1515
env:
1616
CARGO_TERM_COLOR: always
1717
RUST_BACKTRACE: full
@@ -25,8 +25,7 @@ jobs:
2525
github.event_name != 'push' ||
2626
( github.event_name == 'push' &&
2727
( github.ref == 'refs/heads/master' ||
28-
github.ref == 'refs/heads/trying' ||
29-
github.ref == 'refs/heads/staging' ||
28+
github.ref == 'refs/heads/gh-readonly-queue/develop' ||
3029
(github.ref == 'refs/heads/develop' && github.event.head_commit.author.name != 'bors[bot]') ||
3130
startsWith(github.ref, 'refs/heads/rc/')
3231
)
@@ -47,7 +46,7 @@ jobs:
4746
PR_COMMONS_BODY: "${{ github.event.pull_request.body }}"
4847
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
4948
LABELS: "${{ toJson(github.event.pull_request.labels.*.name) }}"
50-
GITHUB_REPOSITORY: ${{ github.repositoty }}
49+
GITHUB_REPOSITORY: ${{ github.repository }}
5150
GITHUB_WORKFLOW: ${{ github.workflow }}
5251
ci_integration_tests_macos:
5352
name: ci_integration_tests_macos

‎.github/workflows/ci_integration_tests_ubuntu.yaml

+4-5
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ on:
99
branches:
1010
- master
1111
- develop
12-
- trying
13-
- staging
1412
- 'rc/*'
13+
merge_group: {}
14+
1515
env:
1616
CARGO_TERM_COLOR: always
1717
RUST_BACKTRACE: full
@@ -26,8 +26,7 @@ jobs:
2626
github.event_name != 'push' ||
2727
( github.event_name == 'push' &&
2828
( github.ref == 'refs/heads/master' ||
29-
github.ref == 'refs/heads/trying' ||
30-
github.ref == 'refs/heads/staging' ||
29+
github.ref == 'refs/heads/gh-readonly-queue/develop' ||
3130
(github.ref == 'refs/heads/develop' && github.event.head_commit.author.name != 'bors[bot]') ||
3231
startsWith(github.ref, 'refs/heads/rc/')
3332
)
@@ -48,7 +47,7 @@ jobs:
4847
PR_COMMONS_BODY: "${{ github.event.pull_request.body }}"
4948
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
5049
LABELS: "${{ toJson(github.event.pull_request.labels.*.name) }}"
51-
GITHUB_REPOSITORY: ${{ github.repositoty }}
50+
GITHUB_REPOSITORY: ${{ github.repository }}
5251
GITHUB_WORKFLOW: ${{ github.workflow }}
5352
ci_integration_tests_ubuntu:
5453
name: ci_integration_tests_ubuntu

‎.github/workflows/ci_integration_tests_windows.yaml

+4-5
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ on:
99
branches:
1010
- master
1111
- develop
12-
- trying
13-
- staging
1412
- 'rc/*'
13+
merge_group: {}
14+
1515
env:
1616
CARGO_TERM_COLOR: always
1717
RUST_BACKTRACE: full
@@ -26,8 +26,7 @@ jobs:
2626
github.event_name != 'push' ||
2727
( github.event_name == 'push' &&
2828
( github.ref == 'refs/heads/master' ||
29-
github.ref == 'refs/heads/trying' ||
30-
github.ref == 'refs/heads/staging' ||
29+
github.ref == 'refs/heads/gh-readonly-queue/develop' ||
3130
(github.ref == 'refs/heads/develop' && github.event.head_commit.author.name != 'bors[bot]') ||
3231
startsWith(github.ref, 'refs/heads/rc/')
3332
)
@@ -48,7 +47,7 @@ jobs:
4847
PR_COMMONS_BODY: "${{ github.event.pull_request.body }}"
4948
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
5049
LABELS: "${{ toJson(github.event.pull_request.labels.*.name) }}"
51-
GITHUB_REPOSITORY: ${{ github.repositoty }}
50+
GITHUB_REPOSITORY: ${{ github.repository }}
5251
GITHUB_WORKFLOW: ${{ github.workflow }}
5352
ci_integration_tests_windows:
5453
name: ci_integration_tests_windows

‎.github/workflows/ci_linters_macos.yaml

+4-5
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ on:
99
branches:
1010
- master
1111
- develop
12-
- trying
13-
- staging
1412
- 'rc/*'
13+
merge_group: {}
14+
1515
env:
1616
CARGO_TERM_COLOR: always
1717
RUST_BACKTRACE: full
@@ -23,8 +23,7 @@ jobs:
2323
github.event_name != 'push' ||
2424
( github.event_name == 'push' &&
2525
( github.ref == 'refs/heads/master' ||
26-
github.ref == 'refs/heads/trying' ||
27-
github.ref == 'refs/heads/staging' ||
26+
github.ref == 'refs/heads/gh-readonly-queue/develop' ||
2827
(github.ref == 'refs/heads/develop' && github.event.head_commit.author.name != 'bors[bot]') ||
2928
startsWith(github.ref, 'refs/heads/rc/')
3029
)
@@ -45,7 +44,7 @@ jobs:
4544
PR_COMMONS_BODY: "${{ github.event.pull_request.body }}"
4645
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
4746
LABELS: "${{ toJson(github.event.pull_request.labels.*.name) }}"
48-
GITHUB_REPOSITORY: ${{ github.repositoty }}
47+
GITHUB_REPOSITORY: ${{ github.repository }}
4948
GITHUB_WORKFLOW: ${{ github.workflow }}
5049
ci_linters_macos:
5150
name: ci_linters_macos

‎.github/workflows/ci_linters_ubuntu.yaml

+4-5
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ on:
99
branches:
1010
- master
1111
- develop
12-
- trying
13-
- staging
1412
- 'rc/*'
13+
merge_group: {}
14+
1515
env:
1616
CARGO_TERM_COLOR: always
1717
RUST_BACKTRACE: full
@@ -23,8 +23,7 @@ jobs:
2323
github.event_name != 'push' ||
2424
( github.event_name == 'push' &&
2525
( github.ref == 'refs/heads/master' ||
26-
github.ref == 'refs/heads/trying' ||
27-
github.ref == 'refs/heads/staging' ||
26+
github.ref == 'refs/heads/gh-readonly-queue/develop' ||
2827
(github.ref == 'refs/heads/develop' && github.event.head_commit.author.name != 'bors[bot]') ||
2928
startsWith(github.ref, 'refs/heads/rc/')
3029
)
@@ -45,7 +44,7 @@ jobs:
4544
PR_COMMONS_BODY: "${{ github.event.pull_request.body }}"
4645
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
4746
LABELS: "${{ toJson(github.event.pull_request.labels.*.name) }}"
48-
GITHUB_REPOSITORY: ${{ github.repositoty }}
47+
GITHUB_REPOSITORY: ${{ github.repository }}
4948
GITHUB_WORKFLOW: ${{ github.workflow }}
5049
ci_linters_ubuntu:
5150
name: ci_linters_ubuntu

‎.github/workflows/ci_quick_checks_macos.yaml

+4-5
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ on:
99
branches:
1010
- master
1111
- develop
12-
- trying
13-
- staging
1412
- 'rc/*'
13+
merge_group: {}
14+
1515
env:
1616
CARGO_TERM_COLOR: always
1717
RUST_BACKTRACE: full
@@ -23,8 +23,7 @@ jobs:
2323
github.event_name != 'push' ||
2424
( github.event_name == 'push' &&
2525
( github.ref == 'refs/heads/master' ||
26-
github.ref == 'refs/heads/trying' ||
27-
github.ref == 'refs/heads/staging' ||
26+
github.ref == 'refs/heads/gh-readonly-queue/develop' ||
2827
(github.ref == 'refs/heads/develop' && github.event.head_commit.author.name != 'bors[bot]') ||
2928
startsWith(github.ref, 'refs/heads/rc/')
3029
)
@@ -45,7 +44,7 @@ jobs:
4544
PR_COMMONS_BODY: "${{ github.event.pull_request.body }}"
4645
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
4746
LABELS: "${{ toJson(github.event.pull_request.labels.*.name) }}"
48-
GITHUB_REPOSITORY: ${{ github.repositoty }}
47+
GITHUB_REPOSITORY: ${{ github.repository }}
4948
GITHUB_WORKFLOW: ${{ github.workflow }}
5049
ci_quick_checks_macos:
5150
name: ci_quick_checks_macos

‎.github/workflows/ci_quick_checks_ubuntu.yaml

+4-5
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ on:
99
branches:
1010
- master
1111
- develop
12-
- trying
13-
- staging
1412
- 'rc/*'
13+
merge_group: {}
14+
1515
env:
1616
CARGO_TERM_COLOR: always
1717
RUST_BACKTRACE: full
@@ -23,8 +23,7 @@ jobs:
2323
github.event_name != 'push' ||
2424
( github.event_name == 'push' &&
2525
( github.ref == 'refs/heads/master' ||
26-
github.ref == 'refs/heads/trying' ||
27-
github.ref == 'refs/heads/staging' ||
26+
github.ref == 'refs/heads/gh-readonly-queue/develop' ||
2827
(github.ref == 'refs/heads/develop' && github.event.head_commit.author.name != 'bors[bot]') ||
2928
startsWith(github.ref, 'refs/heads/rc/')
3029
)
@@ -45,7 +44,7 @@ jobs:
4544
PR_COMMONS_BODY: "${{ github.event.pull_request.body }}"
4645
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
4746
LABELS: "${{ toJson(github.event.pull_request.labels.*.name) }}"
48-
GITHUB_REPOSITORY: ${{ github.repositoty }}
47+
GITHUB_REPOSITORY: ${{ github.repository }}
4948
GITHUB_WORKFLOW: ${{ github.workflow }}
5049
ci_quick_checks_ubuntu:
5150
name: ci_quick_checks_ubuntu

0 commit comments

Comments
 (0)