|
1 | 1 | # Contribution Guidelines |
2 | 2 |
|
3 | 3 | ## Raising an Issue |
| 4 | + |
4 | 5 | If you raise an issue against this repository, please include as much information as possible to reproduce any bugs, |
5 | 6 | or specific locations in the case of content errors. |
6 | 7 |
|
7 | 8 | ## Contributing code |
| 9 | + |
8 | 10 | To contribute code, please fork the repository and raise a pull request. |
9 | 11 |
|
10 | 12 | Ideally pull requests should be fairly granular and aim to solve one problem each. It would also be helpful if they |
11 | 13 | linked to an issue. If the maintainers cannot understand why a pull request was raised, it will be rejected, |
12 | 14 | so please explain why the changes need to be made (unless it is self-evident). |
13 | 15 |
|
14 | 16 | ### Merge responsibility |
15 | | -* It is the responsibility of the reviewer to merge branches they have approved. |
16 | | -* It is the responsibility of the author of the merge to ensure their merge is in a mergeable state. |
17 | | -* It is the responsibility of the maintainers to ensure the merge process is unambiguous and automated where possible. |
| 17 | + |
| 18 | +- It is the responsibility of the reviewer to merge branches they have approved. |
| 19 | +- It is the responsibility of the author of the merge to ensure their merge is in a mergeable state. |
| 20 | +- It is the responsibility of the maintainers to ensure the merge process is unambiguous and automated where possible. |
18 | 21 |
|
19 | 22 | ### Branch naming |
| 23 | + |
20 | 24 | Branch names should be of the format: |
21 | 25 |
|
22 | | -`apm-nnn-short-issue-description` |
| 26 | +`aea-nnn-short-issue-description` |
23 | 27 |
|
24 | 28 | Multiple branches are permitted for the same ticket. |
25 | 29 |
|
26 | 30 | ### Commit messages |
| 31 | + |
27 | 32 | Commit messages should be formatted as follows: |
28 | | -``` |
29 | | -APM-NNN Summary of changes |
| 33 | + |
| 34 | +```text |
| 35 | +AEA-NNN Summary of changes |
30 | 36 |
|
31 | 37 | Longer description of changes if explaining rationale is necessary, |
32 | 38 | limited to 80 columns and spanning as many lines as you need. |
33 | 39 | ``` |
34 | 40 |
|
| 41 | +Commits from a pull request get squashed into a single commit on merge, using the pull request title as the commit message. |
| 42 | +Please format your pull request title using tags from [ESLint Convention](https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-changelog-eslint) as follows: |
| 43 | + |
| 44 | +```text |
| 45 | +Tag: [AEA-NNNN] - Short description |
| 46 | +``` |
| 47 | + |
| 48 | +Tag can be one of: |
| 49 | + |
| 50 | +- `Fix` - for a bug fix. (Patch release) |
| 51 | +- `Update` - either for a backwards-compatible enhancement or for a rule change that adds reported problems. (Patch release) |
| 52 | +- `New` - implemented a new feature. (Minor release) |
| 53 | +- `Breaking` - for a backwards-incompatible enhancement or feature. (Major release) |
| 54 | +- `Docs` - changes to documentation only. (Patch release) |
| 55 | +- `Build` - changes to build process only. (No release) |
| 56 | +- `Upgrade` - for a dependency upgrade. (Patch release) |
| 57 | +- `Chore` - for refactoring, adding tests, etc. (anything that isn't user-facing). (Patch release) |
| 58 | + |
| 59 | +If the current release is x.y.z then |
| 60 | +- a patch release increases z by 1 |
| 61 | +- a minor release increases y by 1 |
| 62 | +- a major release increases x by 1 |
| 63 | + |
| 64 | +Correct tagging is necessary for our automated versioning and release process ([Release](./RELEASE.md)). |
| 65 | + |
35 | 66 | ### Changelog |
36 | | -Every pull request must include a change to the changelog. |
37 | 67 |
|
38 | | -Add changes to the top of the current date. If the date is old, the reviewer should update the changelog to be correct before merging. |
| 68 | +Release changelogs are generated from the titles of pull requests merged into the `main` branch. Please ensure that your pull request title is sufficiently descriptive of the changes made. |
0 commit comments