Skip to content

Commit 20a92a3

Browse files
authored
Merge pull request #926 from hybridgroup/dev
all: prepare for release v2.0.1
2 parents 57b31e8 + eda2790 commit 20a92a3

File tree

8 files changed

+2754
-1180
lines changed

8 files changed

+2754
-1180
lines changed

.chglog/CHANGELOG.gobot.md

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,28 @@
1-
{{ range .Versions }}
2-
{{ if .Tag.Previous }}{{ .Tag.Name }}{{ else }}{{ .Tag.Name }}{{ end }}
3-
---
1+
# {{ .Info.Title }}
2+
3+
Please adjust manually before add content to CHANGELOG.md.
4+
5+
{{ if .Versions -}}
6+
## [Unreleased]({{ .Info.RepositoryURL }}/compare/{{ $latest := index .Versions 0 }}{{ $latest.Tag.Name }}...HEAD)
7+
8+
{{ if .Unreleased.CommitGroups -}}
9+
{{ range .Unreleased.CommitGroups -}}
10+
### {{ .Title }}
11+
{{ range .Commits -}}
12+
* {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
13+
{{ end }}
14+
{{ end -}}
15+
{{ end -}}
16+
{{ end -}}
17+
18+
{{ 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 }})
19+
420
{{ range .CommitGroups -}}
5-
* **{{ .Title }}**
21+
### {{ .Title }}
622

7-
{{ range .Commits -}}
8-
* {{ if .Scope }}**>{{ .Scope }}:<** {{ end }}{{ .Subject }}
9-
{{ end }}
23+
{{ range .Commits -}}
24+
* {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
25+
{{ end }}
1026
{{ end -}}
1127

1228
{{- if .NoteGroups -}}

.chglog/README.md

Lines changed: 51 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,73 @@
44

55
We using <https://github.com/git-chglog/git-chglog>, so refer to this side for installation instructions.
66

7+
It is possible to test the tool by `git-chglog --init` without overriding anything.
8+
79
## Usage
810

9-
Example for a new release "v2.0.0":
11+
Example for a new release "v2.0.1":
1012

1113
```sh
14+
git checkout release
15+
git pull
1216
git fetch --tags
13-
git-chglog --no-case --next-tag 2.0.0 v1.16.0.. > .chglog/chglog_tmp.md
17+
git checkout dev
18+
git pull upstream dev
19+
git-chglog --config .chglog/config_gobot.yml --no-case --next-tag v2.0.1 v2.0.0.. > .chglog/chglog_tmp.md
1420
```
1521

1622
## Compare
1723

1824
If unsure about any result of running git-chglog, just use:
19-
`git log --since=2022-05-02 --pretty="- %s`
25+
`git log --since=2022-05-15 --pretty="- %s`
2026

2127
## Manual adjustment
2228

23-
Because there is no commit style guide yet, some manual work is needed to bring the items in the correct position.
24-
Please refer to the current CHANGELOG.md to find the correct way. In general we try to use this style:
29+
Most likely some manual work is needed to bring the items in the correct position. We use the style from
30+
["keep a changelog"](https://keepachangelog.com/en/1.1.0/), together with the [standard template](https://github.com/git-chglog/example-type-scope-subject/blob/master/CHANGELOG.standard.md).
31+
The changelog will be generated based on the commit messages, so please follow the
32+
[Convention for Pull Request Descriptions](../CONTRIBUTING.md).
33+
34+
An example for the following commits:
35+
36+
* type(scope): description
37+
* i2c(PCF8583): added
38+
* gpio(HD44780): fix wrong constants
39+
* raspi(PWM): refactor usage
40+
* docs(core): usage of Kernel driver
41+
* or alternative: core(docs): usage of Kernel driver
42+
* build(style): adjust rule for golangci-lint
43+
44+
```md
45+
### build
46+
47+
* **style**: adjust rule for golangci-lint
48+
49+
### docs
50+
51+
* **core**: usage of Kernel driver
52+
53+
### i2c
54+
55+
* **PCF8583**: added
56+
2557

26-
* titles will be converted to lower case
27-
* titles are lexical ordered
28-
* each platform has its own title (e.g. **raspi**)
29-
* fixes has the title **bugfix**
30-
* title **api**, **drivers** or **example** is used for changes below related folder
31-
* title **core** is used for changes of common code, e.g. utilities, system
32-
* further special titles **build**, **docs** and **test** can be used
58+
### gpio
59+
60+
* **HD44780**: fix wrong constants
61+
62+
### raspi
63+
64+
* **PWM**: refactor usage
65+
66+
### Type
67+
68+
* **scope:** description
69+
```
70+
71+
If in doubt, please refer to the current CHANGELOG.md to find the correct way.
3372

3473
## Finalization
3574

3675
After all work is done in the temporary changelog file, the content can be moved to the real one and the "chglog_tmp.md"
3776
file can be removed.
38-
39-
## TODO's
40-
41-
* introduce a commit style guide
42-
* convert the changelog format to a more common style, see <https://github.com/git-chglog/example-type-scope-subject/tree/master>

.chglog/config.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

.chglog/config_gobot.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
style: github
2+
template: CHANGELOG.gobot.md
3+
info:
4+
title: Auto-Generated Changelog
5+
repository_url: https://github.com/hybridgroup/gobot
6+
options:
7+
header:
8+
pattern: "^(\\w*)(?:\\(([\\w\\$\\.\\-\\*\\s]*)\\))?\\:?\\s(.*)$"
9+
pattern_maps:
10+
- Type
11+
- Scope
12+
- Subject
13+
notes:
14+
keywords:
15+
- BREAKING CHANGE

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@ count.out
1111
vendor/
1212
.idea/
1313
coverage.txt
14+
.chglog/chglog_tmp*.md
15+
.chglog/CHANGELOG.tpl*.md
16+
.chglog/config.yml

0 commit comments

Comments
 (0)