From f563a215d044e3397e2466ade7709b371a7e9854 Mon Sep 17 00:00:00 2001 From: Sagi Date: Sat, 3 Sep 2022 11:04:36 +0800 Subject: [PATCH 1/6] update issue template content and rename pull requerest template name --- .gitee/ISSUE_TEMPLATE.zh-CN.md | 44 +++++++++++++++++++ ...LATE.md => PULL_REQUEST_TEMPLATE.zh-CN.md} | 0 2 files changed, 44 insertions(+) create mode 100644 .gitee/ISSUE_TEMPLATE.zh-CN.md rename .gitee/{PULL_REQUEST_TEMPLATE.md => PULL_REQUEST_TEMPLATE.zh-CN.md} (100%) diff --git a/.gitee/ISSUE_TEMPLATE.zh-CN.md b/.gitee/ISSUE_TEMPLATE.zh-CN.md new file mode 100644 index 0000000..c82e19e --- /dev/null +++ b/.gitee/ISSUE_TEMPLATE.zh-CN.md @@ -0,0 +1,44 @@ +## Issue 主题 + +请简述您当前遇到的问题，或者您希望在我们项目中看到的特性。可以告诉我们为此您做过的尝试，以及发生了什么现象。 + +## 环境信息 + +- 发生问题的程序版本: +- 最后一个功能正常的版本(如果适用请反馈给我们): +- 操作系统版本: +- Node.js 版本: +- Npm or Yarn 包管理器: +- JDK 版本: +- 其他信息: + +## 详细信息 + +**我要反馈...** + +[ ] 缺陷 +[ ] 新特性 + +请您尽可能详细描述您遇到的问题现象，或者希望在项目中看的到特性。 + + + + + +**当前的现象:** + + +**期望的结果:** + + +**重现步骤:** + + +**相关代码:** + +``` +请在这些粘贴程序堆栈或者相关代码 +``` + +**其他信息:** + diff --git a/.gitee/PULL_REQUEST_TEMPLATE.md b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md similarity index 100% rename from .gitee/PULL_REQUEST_TEMPLATE.md rename to .gitee/PULL_REQUEST_TEMPLATE.zh-CN.md -- Gitee From 9fa3a468067d190ee84c81831b61133a370bc7e1 Mon Sep 17 00:00:00 2001 From: Sagi Date: Sat, 3 Sep 2022 11:12:14 +0800 Subject: [PATCH 2/6] add explain that how to feed back a bug. --- .gitee/ISSUE_TEMPLATE.zh-CN.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitee/ISSUE_TEMPLATE.zh-CN.md b/.gitee/ISSUE_TEMPLATE.zh-CN.md index c82e19e..fb74bf3 100644 --- a/.gitee/ISSUE_TEMPLATE.zh-CN.md +++ b/.gitee/ISSUE_TEMPLATE.zh-CN.md @@ -12,12 +12,12 @@ - JDK 版本: - 其他信息: -## 详细信息 +## 详细描述 -**我要反馈...** - +**我要反馈** [ ] 缺陷 [ ] 新特性 + 请您尽可能详细描述您遇到的问题现象，或者希望在项目中看的到特性。 @@ -26,13 +26,13 @@ **当前的现象:** - +请描述缺陷的详细清单 **期望的结果:** - +请描述如果程序没有缺陷的正常表现结果 **重现步骤:** - +请描述可以再现次缺陷的操作步骤，最好提供示例代码 **相关代码:** @@ -41,4 +41,4 @@ ``` **其他信息:** - +您可以在这里反馈与当前问题相关的其他信息，例如：相关的其他Issue, 堆栈信息，您的修复建议，社区的相关讨论链接等。 -- Gitee From e5ce4c9d79b1fa8a49d320a8cbcddaa09ac4a018 Mon Sep 17 00:00:00 2001 From: Sagi Date: Sat, 3 Sep 2022 11:14:04 +0800 Subject: [PATCH 3/6] update tempalte content --- .gitee/ISSUE_TEMPLATE.zh-CN.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitee/ISSUE_TEMPLATE.zh-CN.md b/.gitee/ISSUE_TEMPLATE.zh-CN.md index fb74bf3..2eca0f6 100644 --- a/.gitee/ISSUE_TEMPLATE.zh-CN.md +++ b/.gitee/ISSUE_TEMPLATE.zh-CN.md @@ -26,12 +26,15 @@ **当前的现象:** + 请描述缺陷的详细清单 **期望的结果:** + 请描述如果程序没有缺陷的正常表现结果 **重现步骤:** + 请描述可以再现次缺陷的操作步骤，最好提供示例代码 **相关代码:** @@ -41,4 +44,5 @@ ``` **其他信息:** + 您可以在这里反馈与当前问题相关的其他信息，例如：相关的其他Issue, 堆栈信息，您的修复建议，社区的相关讨论链接等。 -- Gitee From a4b9120f07bb4c2cf37b4dbde5277c5de1d238d9 Mon Sep 17 00:00:00 2001 From: Sagi Date: Sat, 3 Sep 2022 11:31:59 +0800 Subject: [PATCH 4/6] update pull request template --- .gitee/ISSUE_TEMPLATE.zh-CN.md | 3 +-- .gitee/PULL_REQUEST_TEMPLATE.zh-CN.md | 17 +++++++---------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.gitee/ISSUE_TEMPLATE.zh-CN.md b/.gitee/ISSUE_TEMPLATE.zh-CN.md index 2eca0f6..57f129d 100644 --- a/.gitee/ISSUE_TEMPLATE.zh-CN.md +++ b/.gitee/ISSUE_TEMPLATE.zh-CN.md @@ -21,8 +21,7 @@ 请您尽可能详细描述您遇到的问题现象，或者希望在项目中看的到特性。 - - + **当前的现象:** diff --git a/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md index d773ccb..d7c0e25 100644 --- a/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md +++ b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md @@ -1,17 +1,14 @@ - + -### Ⅰ. Describe what this PR did +## 描述 + +## 关联Issues + -### Ⅱ. Does this pull request fix one issue? - +## 测试用例 -### Ⅲ. Why don't you add test cases (unit test/integration test)? +## 展示效果 -### Ⅳ. Describe how to verify it - - -### Ⅴ. Special notes for reviews - -- Gitee From 1ead8d0c3243856e6f53662a8d24ee264478d521 Mon Sep 17 00:00:00 2001 From: Sagi Date: Sat, 3 Sep 2022 11:36:43 +0800 Subject: [PATCH 5/6] update pull reqest template content --- .gitee/PULL_REQUEST_TEMPLATE.zh-CN.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md index d7c0e25..cf1508d 100644 --- a/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md +++ b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md @@ -1,10 +1,12 @@ ## 描述 - + +请您描述在这次PR做了什么工作 ## 关联Issues - + +如果您修复了具体的issue，请标注“fixes ####”，例如：fixes #I5OYU8 ## 测试用例 -- Gitee From b191857fcffbd206788b718eebffd99f99b0c16f Mon Sep 17 00:00:00 2001 From: Sagi Date: Sat, 3 Sep 2022 11:45:35 +0800 Subject: [PATCH 6/6] update how to report issue and submit pr --- CONTRIBUTING.md | 6 +- zh-cn/CONTRIBUTING.md | 203 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 206 insertions(+), 3 deletions(-) create mode 100644 zh-cn/CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 39f4550..aaa2a18 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,11 +17,11 @@ Security issues are always treated seriously. As our usual principle, we discour ## Reporting general issues -To be honest, we regard every user of UBML as a very kind contributor. After experiencing UBML, you may have some feedback for the project. Then feel free to open an issue via [NEW ISSUE](http://open.inspur.com/open-igix/ubml/issues/new). +To be honest, we regard every user of UBML as a very kind contributor. After experiencing UBML, you may have some feedback for the project. Then feel free to open an issue via [NEW ISSUE](https://gitee.com/ubml/community/issues/new). Since we collaborate project UBML in a distributed way, we appreciate **WELL-WRITTEN**, **DETAILED**, **EXPLICIT** issue reports. To make the communication more efficient, we wish everyone could search if your issue is an existing one in the searching list. If you find it existing, please add your details in comments under the existing issue instead of opening a brand new one. -To make the issue details as standard as possible, we setup an [ISSUE TEMPLATE](./.gitee/ISSUE_TEMPLATE) for issue +To make the issue details as standard as possible, we setup an [ISSUE TEMPLATE](./.gitee/ISSUE_TEMPLATE.zh-CN.md) for issue reporters. Please **BE SURE** to follow the instructions to fill fields in template. There are a lot of cases when you could open an issue: @@ -154,7 +154,7 @@ No matter commit message, or commit content, we do take more emphasis on code re ### PR Description PR is the only way to make change to UBML project files. To help reviewers better get your purpose, PR description - could not be too detailed. We encourage contributors to follow the [PR template](./.gitee/PULL_REQUEST_TEMPLATE.md + could not be too detailed. We encourage contributors to follow the [PR template](./.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md ) to finish the pull request. ## Test case contribution diff --git a/zh-cn/CONTRIBUTING.md b/zh-cn/CONTRIBUTING.md new file mode 100644 index 0000000..b027846 --- /dev/null +++ b/zh-cn/CONTRIBUTING.md @@ -0,0 +1,203 @@ +# 如何贡献UBML + +It is warmly welcomed if you have interest to hack on UBML. First, we encourage this kind of willing very much. And here is a list of contributing guide for you. + +## Topics + +* [Reporting security issues](#reporting-security-issues) +* [反馈Issue](#reporting-general-issues) +* [Code and doc contribution](#code-and-doc-contribution) +* [Test case contribution](#test-case-contribution) +* [Engage to help anything](#engage-to-help-anything) +* [Code Style](#code-style) + +## Reporting security issues + +Security issues are always treated seriously. As our usual principle, we discourage anyone to spread security issues. If you find a security issue of UBML, please do not discuss it in public and even do not open a public issue. Instead we encourage you to send us a private email to [ubml_user@groups.163.com](mailto:ubml_user@groups.163.com) or [ubml_dev@groups.163.com](mailto:ubml_dev@groups.163.com)to report this. + +## 反馈Issue + +To be honest, we regard every user of UBML as a very kind contributor. After experiencing UBML, you may have some feedback for the project. Then feel free to open an issue via [NEW ISSUE](https://gitee.com/ubml/community/issues/new). + +Since we collaborate project UBML in a distributed way, we appreciate **WELL-WRITTEN**, **DETAILED**, **EXPLICIT** issue reports. To make the communication more efficient, we wish everyone could search if your issue is an existing one in the searching list. If you find it existing, please add your details in comments under the existing issue instead of opening a brand new one. + +To make the issue details as standard as possible, we setup an [ISSUE TEMPLATE](./.gitee/ISSUE_TEMPLATE.zh-CN.md) for issue + reporters. Please **BE SURE** to follow the instructions to fill fields in template. + +There are a lot of cases when you could open an issue: + +* bug report +* feature request +* performance issues +* feature proposal +* feature design +* help wanted +* doc incomplete +* test improvement +* any questions on project +* and so on + +Also we must remind that when filling a new issue, please remember to remove the sensitive data from your post. Sensitive data could be password, secret key, network locations, private business data and so on. + +## Code and doc contribution + +Every action to make project UBML better is encouraged. On GitHub, every improvement for UBML could be via a PR (short for pull request). + +* If you find a typo, try to fix it! +* If you find a bug, try to fix it! +* If you find some redundant codes, try to remove them! +* If you find some test cases missing, try to add them! +* If you could enhance a feature, please **DO NOT** hesitate! +* If you find code implicit, try to add comments to make it clear! +* If you find code ugly, try to refactor that! +* If you can help to improve documents, it could not be better! +* If you find document incorrect, just do it and fix that! +* ... + +Actually it is impossible to list them completely. Just remember one principle: + +> WE ARE LOOKING FORWARD TO ANY PR FROM YOU. + +Since you are ready to improve UBML with a PR, we suggest you could take a look at the PR rules here. + +* [Workspace Preparation](#workspace-preparation) +* [Branch Definition](#branch-definition) +* [Commit Rules](#commit-rules) +* [PR Description](#pr-description) + +### Workspace Preparation + +To put forward a PR, we assume you have registered a GitHub ID. Then you could finish the preparation in the following steps: + +1. **FORK** UBML to your repository. To make this work, you just need to click the button Fork in right-left of [ubml +/ubml-standard](https://gitee.com/ubml/ubml-standard) main page. Then you will end up with your repository in `https +://gitee.com//ubml-standard`, in which `your-username` is your Gitee username. + +1. **CLONE** your own repository to develop locally. Use `git clone git@gitee.com:/ubml-standard.git` to clone repository to your local machine. Then you can create new branches to finish the change you wish to make. + +1. **Set Remote** upstream to be `git@gitee.com:ubml/ubml-standard.git` using the following two commands: + +``` +git remote add upstream git@giteee.com:ubml/ubml-standard.git +git remote set-url --push upstream no-pushing +``` + +With this remote setting, you can check your git remote configuration like this: + +``` +$ git remote -v +origin git@gitee.com:/ubml-standard.git (fetch) +origin git@gitee.com:/ubml-standard.git (push) +upstream git@gitee.com:ubml/ubml-standard.git (fetch) +upstream no-pushing (push) +``` + +Adding this, we can easily synchronize local branches with upstream branches. + +### Branch Definition + +Right now we assume every contribution via pull request is for [branch develop](https://gitee.com/ubml/ubml-standard +/tree/develop) in UBML. Before contributing, be aware of branch definition would help a lot. + +As a contributor, keep in mind again that every contribution via pull request is for branch develop. While in project + UBML, there are several other branches, we generally call them release branches(such as 0.9.0,0.9.1), feature branches, hotfix branches and master branch. + +When officially releasing a version, there will be a release branch and named with the version number. + +After the release, we will merge the commit of the release branch into the master branch. + +When we find that there is a bug in a certain version, we will decide to fix it in a later version or fix it in a specific hotfix version. When we decide to fix the hotfix version, we will checkout the hotfix branch based on the corresponding release branch, perform code repair and verification, and merge it into the develop branch and the master branch. + +For larger features, we will pull out the feature branch for development and verification. + + +### Commit Rules + +Actually in UBML, we take two rules serious when committing: + +* [Commit Message](#commit-message) +* [Commit Content](#commit-content) + +#### Commit Message + +Commit message could help reviewers better understand what is the purpose of submitted PR. It could help accelerate the code review procedure as well. We encourage contributors to use **EXPLICIT** commit message rather than ambiguous message. In general, we advocate the following commit message type: + +* docs: xxxx. For example, "docs: add docs about ubml-models introduction". +* feature: xxxx.For example, "feature: support VO customization". +* bugfix: xxxx. For example, "bugfix: fix panic when input nil parameter". +* refactor: xxxx. For example, "refactor: simplify to make codes more readable". +* test: xxx. For example, "test: add unit test case for func InsertIntoArray". +* other readable and explicit expression ways. + +On the other side, we discourage contributors from committing message like the following ways: + +* ~~fix bug~~ +* ~~update~~ +* ~~add doc~~ + +If you get lost, please see [How to Write a Git Commit Message](http://chris.beams.io/posts/git-commit/) for a start. + +#### Commit Content + +Commit content represents all content changes included in one commit. We had better include things in one single commit which could support reviewer's complete review without any other commits' help. In another word, contents in one single commit can pass the CI to avoid code mess. In brief, there are three minor rules for us to keep in mind: + +* avoid very large change in a commit; +* complete and reviewable for each commit. +* check git config(`user.name`, `user.email`) when committing to ensure that it is associated with your github ID. + + +In addition, in the code change part, we suggest that all contributors should read the [code style of UBML](#code-style). + +No matter commit message, or commit content, we do take more emphasis on code review. + + +### PR Description + +PR is the only way to make change to UBML project files. To help reviewers better get your purpose, PR description + could not be too detailed. We encourage contributors to follow the [PR template](./.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md + ) to finish the pull request. + +## Test case contribution + +Any test case would be welcomed. Currently, UBML function test cases are high priority. + +* For unit test, you need to create a test file named `xxxTest.java` in the test directory of the same module. Recommend you to use the junit5 UT framework + +* For integration test, you can put the integration test in the test directory or the UBML-test module. It is recommended to use the mockito test framework. + +## Engage to help anything + +We choose Gitee as the primary place for UBML to collaborate. So the latest updates of UBML are always here. Although + contributions via PR is an explicit way to help, we still call for any other ways. + +* reply to other's issues if you could; +* help solve other user's problems; +* help review other's PR design; +* help review other's codes in PR; +* discuss about UBML to make things clearer; +* advocate UBML technology beyond GitHub; +* write blogs on UBML and so on. + + +## Code Style + +UBML code style Comply with Alibaba Java Coding Guidelines. + + +### Guidelines +[Alibaba-Java-Coding-Guidelines](https://alibaba.github.io/Alibaba-Java-Coding-Guidelines/) + + +### IDE Plugin Install（not necessary） + +*It is not necessary to install, if you want to find a problem when you are coding.* + + +#### idea IDE +[p3c-idea-plugin-install](https://github.com/alibaba/p3c/blob/master/idea-plugin/README.md) + +#### eclipse IDE +[p3c-eclipse-plugin-install](https://github.com/alibaba/p3c/blob/master/eclipse-plugin/README.md) + + +In a word, **ANY HELP IS CONTRIBUTION.** \ No newline at end of file -- Gitee