From b11bc2f7dae20c42f600fc3e2df40771d1c67c72 Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong(cubxxw)" <3293172751nss@gmail.com> Date: Tue, 16 May 2023 13:54:09 +0800 Subject: [PATCH 1/6] ci: join the desgin of chglog and init Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> --- CHANGELOG/.chglog/CHANGELOG.tpl.md | 30 ++++++++++++++++++++++++++++++ CHANGELOG/.chglog/config.yml | 28 ++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 CHANGELOG/.chglog/CHANGELOG.tpl.md create mode 100644 CHANGELOG/.chglog/config.yml diff --git a/CHANGELOG/.chglog/CHANGELOG.tpl.md b/CHANGELOG/.chglog/CHANGELOG.tpl.md new file mode 100644 index 000000000..60a67d5bc --- /dev/null +++ b/CHANGELOG/.chglog/CHANGELOG.tpl.md @@ -0,0 +1,30 @@ +{{ range .Versions }} + +## {{ if .Tag.Previous }}[{{ .Tag.Name }}]({{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}){{ else }}{{ .Tag.Name }}{{ end }} ({{ datetime "2006-01-02" .Tag.Date }}) + +{{ range .CommitGroups -}} +### {{ .Title }} + +{{ range .Commits -}} +* {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }} +{{ end }} +{{ end -}} + +{{- if .RevertCommits -}} +### Reverts + +{{ range .RevertCommits -}} +* {{ .Revert.Header }} +{{ end }} +{{ end -}} + +{{- if .NoteGroups -}} +{{ range .NoteGroups -}} +### {{ .Title }} + +{{ range .Notes }} +{{ .Body }} +{{ end }} +{{ end -}} +{{ end -}} +{{ end -}} \ No newline at end of file diff --git a/CHANGELOG/.chglog/config.yml b/CHANGELOG/.chglog/config.yml new file mode 100644 index 000000000..729a716f6 --- /dev/null +++ b/CHANGELOG/.chglog/config.yml @@ -0,0 +1,28 @@ +style: github +template: CHANGELOG.tpl.md +info: + title: CHANGELOG + repository_url: https://github.com/marmotedu/iam +options: + commits: + filters: + Type: + - feat + - fix + - perf + - refactor + commit_groups: + title_maps: + feat: Features + fix: Bug Fixes + perf: Performance Improvements + refactor: Code Refactoring + header: + pattern: "^(\\w*)(?:\\(([\\w\\$\\.\\-\\*\\s]*)\\))?\\:\\s(.*)$" + pattern_maps: + - Type + - Scope + - Subject + notes: + keywords: + - BREAKING CHANGE From 00abdc9ba26c83f21a92ad8bad45c6b6b1ed9a95 Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong(cubxxw)" <3293172751nss@gmail.com> Date: Tue, 16 May 2023 14:44:00 +0800 Subject: [PATCH 2/6] feat: add all desgin Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> --- .github/workflows/link-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/link-pr.yml b/.github/workflows/link-pr.yml index 3a07c2ebd..0750ecc34 100644 --- a/.github/workflows/link-pr.yml +++ b/.github/workflows/link-pr.yml @@ -38,6 +38,6 @@ jobs: if: env.lychee_exit_code != 0 uses: peter-evans/create-issue-from-file@v4 with: - title: Link Checker Report + title: Bug reports for links in OpenIM docs content-filepath: ./lychee/out.md labels: kind/documentation, triage/unresolved, report From c7296442d65652260ff34aa688a01ce59fa70436 Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong(cubxxw)" <3293172751nss@gmail.com> Date: Tue, 16 May 2023 15:00:51 +0800 Subject: [PATCH 3/6] fix: changelog error Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> --- script/make-rules/common.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/script/make-rules/common.mk b/script/make-rules/common.mk index bb900d8ae..cfe3adf95 100644 --- a/script/make-rules/common.mk +++ b/script/make-rules/common.mk @@ -59,7 +59,9 @@ $(shell mkdir -p $(TMP_DIR)) endif ifeq ($(origin VERSION), undefined) -VERSION := $(shell git describe --abbrev=0 --dirty --always --tags | sed 's/-/./g') +# VERSION := $(shell git describe --abbrev=0 --dirty --always --tags | sed 's/-/./g') #v2.3.3.dirty +VERSION := $(shell git describe --tags --always --match="v*" --dirty | sed 's/-/./g') #v2.3.3.631.g00abdc9b.dirty +# v2.3.3: git tag endif # Check if the tree is dirty. default to dirty(maybe u should commit?) From dae4b78d32844cfe7393a04675f55433499f7c10 Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong(cubxxw)" <3293172751nss@gmail.com> Date: Tue, 16 May 2023 15:34:53 +0800 Subject: [PATCH 4/6] feat: super log dergen Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> --- CHANGELOG/.chglog/CHANGELOG.tpl.md | 12 +- CHANGELOG/.chglog/config.yml | 26 ++-- CHANGELOG/CHANGELOG-0.0.0.md | 228 +++++++++++++++++++++++++++++ 3 files changed, 252 insertions(+), 14 deletions(-) create mode 100644 CHANGELOG/CHANGELOG-0.0.0.md diff --git a/CHANGELOG/.chglog/CHANGELOG.tpl.md b/CHANGELOG/.chglog/CHANGELOG.tpl.md index 60a67d5bc..a1618de92 100644 --- a/CHANGELOG/.chglog/CHANGELOG.tpl.md +++ b/CHANGELOG/.chglog/CHANGELOG.tpl.md @@ -1,6 +1,8 @@ {{ range .Versions }} -## {{ if .Tag.Previous }}[{{ .Tag.Name }}]({{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}){{ else }}{{ .Tag.Name }}{{ end }} ({{ datetime "2006-01-02" .Tag.Date }}) +## {{ if .Tag.Previous }}[{{ .Tag.Name }}]({{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}){{ else }}{{ .Tag.Name }}{{ end }} + +> {{ datetime "2006-01-02" .Tag.Date }} {{ range .CommitGroups -}} ### {{ .Title }} @@ -18,6 +20,14 @@ {{ end }} {{ end -}} +{{- if .MergeCommits -}} +### Pull Requests + +{{ range .MergeCommits -}} +* {{ .Header }} +{{ end }} +{{ end -}} + {{- if .NoteGroups -}} {{ range .NoteGroups -}} ### {{ .Title }} diff --git a/CHANGELOG/.chglog/config.yml b/CHANGELOG/.chglog/config.yml index 729a716f6..b1b42dc1a 100644 --- a/CHANGELOG/.chglog/config.yml +++ b/CHANGELOG/.chglog/config.yml @@ -2,21 +2,21 @@ style: github template: CHANGELOG.tpl.md info: title: CHANGELOG - repository_url: https://github.com/marmotedu/iam + repository_url: https://github.com/OpenIMSDK/Open-IM-Server options: commits: - filters: - Type: - - feat - - fix - - perf - - refactor + # filters: + # Type: + # - feat + # - fix + # - perf + # - refactor commit_groups: - title_maps: - feat: Features - fix: Bug Fixes - perf: Performance Improvements - refactor: Code Refactoring + # title_maps: + # feat: Features + # fix: Bug Fixes + # perf: Performance Improvements + # refactor: Code Refactoring header: pattern: "^(\\w*)(?:\\(([\\w\\$\\.\\-\\*\\s]*)\\))?\\:\\s(.*)$" pattern_maps: @@ -25,4 +25,4 @@ options: - Subject notes: keywords: - - BREAKING CHANGE + - BREAKING CHANGE \ No newline at end of file diff --git a/CHANGELOG/CHANGELOG-0.0.0.md b/CHANGELOG/CHANGELOG-0.0.0.md new file mode 100644 index 000000000..ab21e1729 --- /dev/null +++ b/CHANGELOG/CHANGELOG-0.0.0.md @@ -0,0 +1,228 @@ + + +## [v2.3.3](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.2...v2.3.3) + +> 2022-09-18 + + + +## [v2.3.2](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.0-rc2...v2.3.2) + +> 2022-09-09 + +### GetSelfUserInfo + +* Handle the case where the user does not exist + +### Pull Requests + +* Merge pull request [#267](https://github.com/OpenIMSDK/Open-IM-Server/issues/267) from ouyangshi/del +* Merge pull request [#265](https://github.com/OpenIMSDK/Open-IM-Server/issues/265) from ouyangshi/del +* Merge pull request [#252](https://github.com/OpenIMSDK/Open-IM-Server/issues/252) from x-shadow-man/config-perf +* Merge pull request [#263](https://github.com/OpenIMSDK/Open-IM-Server/issues/263) from ouyangshi/main +* Merge pull request [#258](https://github.com/OpenIMSDK/Open-IM-Server/issues/258) from ouyangshi/main +* Merge pull request [#261](https://github.com/OpenIMSDK/Open-IM-Server/issues/261) from ouyangshi/v2.3.0release + + + +## [v2.3.0-rc2](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.0-rc1...v2.3.0-rc2) + +> 2022-07-29 + + + +## [v2.3.0-rc1](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.0-rc0...v2.3.0-rc1) + +> 2022-07-25 + + + +## [v2.3.0-rc0](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.2.0...v2.3.0-rc0) + +> 2022-07-15 + + + +## [v2.2.0](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.1.0...v2.2.0) + +> 2022-07-01 + + + +## [v2.1.0](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.10...v2.1.0) + +> 2022-06-17 + + + +## [v2.0.10](https://github.com/OpenIMSDK/Open-IM-Server/compare/list...v2.0.10) + +> 2022-05-13 + + + +## [list](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.9...list) + +> 2022-04-29 + + + +## [v2.0.9](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.7...v2.0.9) + +> 2022-04-29 + +### Reverts + +* update etcd to v3.5.2 ([#206](https://github.com/OpenIMSDK/Open-IM-Server/issues/206)) + + + +## [v2.0.7](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.6...v2.0.7) + +> 2022-04-08 + + + +## [v2.0.6](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.5...v2.0.6) + +> 2022-04-01 + +### Fix + +* json tag value of UserIDResult.UserID ([#178](https://github.com/OpenIMSDK/Open-IM-Server/issues/178)) + +### Pull Requests + +* Merge pull request [#173](https://github.com/OpenIMSDK/Open-IM-Server/issues/173) from OpenIMSDK/tuoyun + + + +## [v2.0.5](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.04...v2.0.5) + +> 2022-03-24 + + + +## [v2.04](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.3...v2.04) + +> 2022-03-18 + + + +## [v2.0.3](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.2...v2.0.3) + +> 2022-03-11 + + + +## [v2.0.2](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.1...v2.0.2) + +> 2022-03-04 + +### Version + +* "3" +* "2" + + + +## [v2.0.1](https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.0...v2.0.1) + +> 2022-02-25 + +### DbMysqlDatabaseName + +* openIM_v2 + + + +## [v2.0.0](https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.7...v2.0.0) + +> 2022-02-23 + +### Pb + +* open_im_sdk.OfflinePushInfo + +### Pull Requests + +* Merge pull request [#131](https://github.com/OpenIMSDK/Open-IM-Server/issues/131) from OpenIMSDK/cms-dev + + + +## [v1.0.7](https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.6...v1.0.7) + +> 2021-12-17 + + + +## [v1.0.6](https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.5...v1.0.6) + +> 2021-12-10 + +### Pb + +* open_im_sdk.OfflinePushInfo + + + +## [v1.0.5](https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.4...v1.0.5) + +> 2021-12-03 + + + +## [v1.0.4](https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.3...v1.0.4) + +> 2021-11-25 + + + +## [v1.0.3](https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.1...v1.0.3) + +> 2021-11-12 + +### Feat + +* test utils ([#26](https://github.com/OpenIMSDK/Open-IM-Server/issues/26)) + +### Fix + +* Startup error ([#11](https://github.com/OpenIMSDK/Open-IM-Server/issues/11)) + +### Pull Requests + +* Merge pull request [#12](https://github.com/OpenIMSDK/Open-IM-Server/issues/12) from njulk/main +* Merge pull request [#9](https://github.com/OpenIMSDK/Open-IM-Server/issues/9) from xmcy0011/dev +* Merge pull request [#6](https://github.com/OpenIMSDK/Open-IM-Server/issues/6) from Bloomingg/int + + + +## [v1.0.1](https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.0...v1.0.1) + +> 2021-11-04 + + + +## v1.0.0 + +> 2021-10-28 + +### Ci + +* ignore files created by docker-compose ([#19](https://github.com/OpenIMSDK/Open-IM-Server/issues/19)) + +### Feat + +* optimise get server ip ([#20](https://github.com/OpenIMSDK/Open-IM-Server/issues/20)) + +### Reverts + +* friend modify +* update + +### Pull Requests + +* Merge pull request [#7](https://github.com/OpenIMSDK/Open-IM-Server/issues/7) from memory-qianxiao/docker-compose_update +* Merge pull request [#4](https://github.com/OpenIMSDK/Open-IM-Server/issues/4) from wujingke/patch-1 + From 14c8ecae447d21b8844550c3e7d4113b61e0883f Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong(cubxxw)" <3293172751nss@gmail.com> Date: Tue, 16 May 2023 15:58:25 +0800 Subject: [PATCH 5/6] feat: add codecov context Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> --- .github/.codecov.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .github/.codecov.yml diff --git a/.github/.codecov.yml b/.github/.codecov.yml new file mode 100644 index 000000000..45e213180 --- /dev/null +++ b/.github/.codecov.yml @@ -0,0 +1,9 @@ +coverage: + status: + project: + default: false # disable the default status that measures entire project + pkg: # declare a new status context "pkg" + paths: + - pkg/* # only include coverage in "pkg/" folder + informational: true # Always pass check + patch: off # disable the commit only checks \ No newline at end of file From 7cf3918f1f4babbd161e35eaa52c8d9468dbfc0a Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong(cubxxw)" <3293172751nss@gmail.com> Date: Tue, 16 May 2023 20:12:13 +0800 Subject: [PATCH 6/6] docs(main): D Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> --- README_zh.md | 206 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 205 insertions(+), 1 deletion(-) diff --git a/README_zh.md b/README_zh.md index cf8dcb3fd..e97439b17 100644 --- a/README_zh.md +++ b/README_zh.md @@ -1 +1,205 @@ -# Open-IM-Server +