on master help sign in
Merge pull request #1230 from haskell-servant/changelog-d
1047510Oleg Grenrus
CONTRIBUTING.md+28−1
@@ -35,7 +35,34 @@ Some things we like:
35Though we aren't sticklers for style, the `.stylish-haskell.yaml` and `HLint.hs`
35Though we aren't sticklers for style, the `.stylish-haskell.yaml` and `HLint.hs`
36files in the repository provide a good baseline for consistency.
36files in the repository provide a good baseline for consistency.
37
37
38−**Important**: please do not modify the changelog files nor the versions of the servant packages you are sending patches for. We take care of this before every release and do it uniformly for all the servant packages, so there's no need to worry about this for your pull requests.
38+**Important**: please do not modify the versions of the servant packages you are sending patches for.
39+
40+## Changelog entries
41+
42+We experiment with using [changelog-d tool](https://github.com/phadej/changelog-d) to assemble changelogs.
43+You are not required to install it.
44+
45+In each PR please add a file to `changelog.d` directory named after issue you are solving or the pull request itself (in a separate commit after you know the pull request number). For example
46+
47+```cabal
48+synopsis: One sentence summary of the change.
49+prs: #1219
50+issues: #1028
51+
52+description: {
53+
54+A longer description. Small changes don't need this.
55+Bigger ones definitely do, for example we try to include migration hints
56+for breaking changes.
57+
58+However if you don't know what to write, that's ok too.
59+
60+By the way, the braces around are omitted when the file is parsed.
61+They can be used so the field doesn't need to be indented, which is handy
62+for prose.
63+
64+}
65+```
39
66
40## PR process
67## PR process
41
68
changelog.d/issue1028new file+10
@@ -0,0 +1,10 @@
1+synopsis: Add NoContentVerb
2+prs: #1228 #1219
3+issues: #1028
4+significance: significant
5+
6+description: {
7+
8+TBW
9+
10+}
changelog.d/issue1200new file+10
@@ -0,0 +1,10 @@
1+synopsis: Fix Verb with headers checking content type differently
2+prs: #1204
3+issues: #1200
4+packages: servant-client servant-client-core servant-http-streams
5+
6+description: {
7+
8+TBW
9+
10+}
changelog.d/todonew file+6
@@ -0,0 +1,6 @@
1+synopsis: unclassified pull requests
2+prs: #1229 #1224 #1226 #1216 #1214 #1194
3+prs: #1194 #1201 #1198 #1197 #1190 #1188
4+prs: #1183 #1181 #1182 #1175 #1175 #1174
5+prs: #1173 #1171 #1154 #1162 #1157 #1159
6+prs: #1156
changelog.d/z-changelog-dnew file+8
@@ -0,0 +1,8 @@
1+synopsis: Try changelog-d for changelog management
2+prs: #1230
3+
4+description: {
5+
6+Check the [CONTRIBUTING.md](https://github.com/haskell-servant/servant/blob/master/CONTRIBUTING.md) for details
7+
8+}