Skip to content

Commit 7f72d53

Browse files
pandaapopandaapo
committed
Fix conflicts.
2 parents 7c6e42c + 74f9abf commit 7f72d53

File tree

971 files changed

+43809
-36115
lines changed

Some content is hidden

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

971 files changed

+43809
-36115
lines changed

‎.asf.yaml‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ github:
3838
- hacktoberfest
3939
enabled_merge_buttons:
4040
squash: true
41-
merge: true
41+
merge: false
4242
rebase: false
4343
protected_branches:
4444
master:
@@ -47,6 +47,25 @@ github:
4747
required_pull_request_reviews:
4848
dismiss_stale_reviews: true
4949
required_approving_review_count: 2
50+
# Attempt to make the auto-generated github emails more easily readable in email clients.
51+
custom_subjects:
52+
new_pr: "[PR] {title} ({repository})"
53+
close_pr: "Re: [PR] {title} ({repository})"
54+
comment_pr: "Re: [PR] {title} ({repository})"
55+
diffcomment: "Re: [PR] {title} ({repository})"
56+
merge_pr: "Re: [PR] {title} ({repository})"
57+
new_issue: "[I] {title} ({repository})"
58+
comment_issue: "Re: [I] {title} ({repository})"
59+
close_issue: "Re: [I] {title} ({repository})"
60+
catchall: "[GH] {title} ({repository})"
61+
new_discussion: "[D] {title} ({repository})"
62+
edit_discussion: "Re: [D] {title} ({repository})"
63+
close_discussion: "Re: [D] {title} ({repository})"
64+
close_discussion_with_comment: "Re: [D] {title} ({repository})"
65+
reopen_discussion: "Re: [D] {title} ({repository})"
66+
new_comment_discussion: "Re: [D] {title} ({repository})"
67+
edit_comment_discussion: "Re: [D] {title} ({repository})"
68+
delete_comment_discussion: "Re: [D] {title} ({repository})"
5069
notifications:
5170
commits: [email protected]
5271
# Send all issue emails (new, closed, comments) to issues@

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,14 @@ body:
101101
options:
102102
- label: Yes I am willing to submit a PR!
103103

104+
- type: checkboxes
105+
attributes:
106+
label: Code of Conduct
107+
description: >
108+
The Code of Conduct helps create a safe space for everyone. We require that everyone agrees to it..
109+
options:
110+
- label: I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct) *
111+
104112
- type: markdown
105113
attributes:
106114
value: "Thanks for completing our form!"

‎.github/ISSUE_TEMPLATE/documentation_related.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,14 @@ body:
5555
options:
5656
- label: Yes I am willing to submit a PR!
5757

58+
- type: checkboxes
59+
attributes:
60+
label: Code of Conduct
61+
description: >
62+
The Code of Conduct helps create a safe space for everyone. We require that everyone agrees to it..
63+
options:
64+
- label: I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct) *
65+
5866
- type: markdown
5967
attributes:
60-
value: "Thanks for completing our form!"
68+
value: "Thanks for completing our form!"

‎.github/ISSUE_TEMPLATE/enhancement_request.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,13 @@ body:
6565
options:
6666
- label: Yes I am willing to submit a PR!
6767

68+
- type: checkboxes
69+
attributes:
70+
label: Code of Conduct
71+
description: >
72+
The Code of Conduct helps create a safe space for everyone. We require that everyone agrees to it..
73+
options:
74+
- label: I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct) *
6875
- type: markdown
6976
attributes:
70-
value: "Thanks for completing our form!"
77+
value: "Thanks for completing our form!"

‎.github/ISSUE_TEMPLATE/feature_request.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,14 @@ body:
5757
options:
5858
- label: Yes I am willing to submit a PR!
5959

60+
- type: checkboxes
61+
attributes:
62+
label: Code of Conduct
63+
description: >
64+
The Code of Conduct helps create a safe space for everyone. We require that everyone agrees to it..
65+
options:
66+
- label: I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct) *
67+
6068
- type: markdown
6169
attributes:
6270
value: "Thanks for completing our form!"

‎.github/ISSUE_TEMPLATE/unit_test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ body:
4141
attributes:
4242
label: Read the unit testing guidelines
4343
description: >
44-
Read the [unit testing guidelines](https://github.com/apache/eventmesh/blob/master/docs/en/contribute/02-write-unit-test.md) before writing unit test code.
44+
Read the [unit testing guidelines](https://eventmesh.apache.org/community/contribute/write-unit-test) before writing unit test code.
4545
options:
4646
- label: >
4747
I have read.
@@ -83,4 +83,4 @@ body:
8383

8484
- type: markdown
8585
attributes:
86-
value: "Thanks for completing our form!"
86+
value: "Thanks for completing our form!"

‎.github/workflows/ci.yml‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,6 @@ jobs:
4848
# queries: ./path/to/local/query, your-org/your-repo/queries@main
4949
languages: ${{ matrix.language }}
5050

51-
- name: Set up JDK ${{ matrix.java }}
52-
uses: actions/setup-java@v3
53-
with:
54-
distribution: 'zulu'
55-
java-version: ${{ matrix.java }}
56-
5751
- name: Cache Gradle packages
5852
uses: actions/cache@v3
5953
with:
@@ -63,9 +57,24 @@ jobs:
6357
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
6458
restore-keys: ${{ runner.os }}-gradle-
6559

60+
- name: Set up JDK 11
61+
uses: actions/setup-java@v3
62+
with:
63+
distribution: 'zulu'
64+
java-version: 11
65+
66+
- name: GenerateGrammarSource
67+
run: ./gradlew clean generateGrammarSource --parallel --daemon
68+
69+
- name: Set up JDK ${{ matrix.java }}
70+
uses: actions/setup-java@v3
71+
with:
72+
distribution: 'zulu'
73+
java-version: ${{ matrix.java }}
74+
6675
# https://docs.gradle.org/current/userguide/performance.html
6776
- name: Build
68-
run: ./gradlew clean build jar dist jacocoTestReport --parallel --daemon
77+
run: ./gradlew clean build jar dist jacocoTestReport -x generateGrammarSource --parallel --daemon
6978

7079
- name: Install plugin
7180
run: ./gradlew installPlugin

‎.github/workflows/greetings.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
name: Greeting
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: actions/first-interaction@v1
29+
- uses: actions/first-interaction@v1.1.1
3030
with:
3131
repo-token: ${{ secrets.GITHUB_TOKEN }}
3232
issue-message: |
@@ -43,7 +43,7 @@ jobs:
4343
4444
|WeChat Assistant|WeChat Public Account|Slack|
4545
|-|-|-|
46-
|<img src="https://github.com/apache/eventmesh/blob/master/resources/wechat-assistant.jpg?raw=true" width="128"/>|<img src="https://github.com/apache/eventmesh/blob/master/resources/wechat-official.jpg?raw=true" width="128"/>|[Join Slack Chat](https://join.slack.com/t/apacheeventmesh/shared_invite/zt-1t1816dli-I0t3OE~IpdYWrZbIWhMbXg)|
46+
|<img src="https://github.com/apache/eventmesh/blob/master/resources/wechat-assistant.jpg?raw=true" width="128"/>|<img src="https://github.com/apache/eventmesh/blob/master/resources/wechat-official.jpg?raw=true" width="128"/>|[Join Slack Chat](https://join.slack.com/t/the-asf/shared_invite/zt-1y375qcox-UW1898e4kZE_pqrNsrBM2g)|
4747
4848
Mailing Lists:
4949
| Name | Description |Subscribe |Unsubscribe|Archive
@@ -65,7 +65,7 @@ jobs:
6565
6666
|WeChat Assistant|WeChat Public Account|Slack|
6767
|-|-|-|
68-
|<img src="https://github.com/apache/eventmesh/blob/master/resources/wechat-assistant.jpg?raw=true" width="128"/>|<img src="https://github.com/apache/eventmesh/blob/master/resources/wechat-official.jpg?raw=true" width="128"/>|[Join Slack Chat](https://join.slack.com/t/apacheeventmesh/shared_invite/zt-1t1816dli-I0t3OE~IpdYWrZbIWhMbXg)|
68+
|<img src="https://github.com/apache/eventmesh/blob/master/resources/wechat-assistant.jpg?raw=true" width="128"/>|<img src="https://github.com/apache/eventmesh/blob/master/resources/wechat-official.jpg?raw=true" width="128"/>|[Join Slack Chat](https://join.slack.com/t/the-asf/shared_invite/zt-1y375qcox-UW1898e4kZE_pqrNsrBM2g)|
6969
7070
Mailing Lists:
7171
| Name | Description |Subscribe |Unsubscribe|Archive

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ logs
1111
*.log
1212
*.log.*
1313
.idea
14+
!/.idea/icon.png
1415
build
1516
.classpath
1617
.project
@@ -47,4 +48,4 @@ bld/
4748
[Oo]bj/
4849
[Ll]og/
4950
[Ll]ogs/
50-
!eventmesh-runtime/bin/*.sh
51+
**/org/apache/eventmesh/connector/jdbc/antlr4/autogeneration/*

‎.idea/icon.png‎

14.5 KB
Loading

0 commit comments

Comments
 (0)