Skip to content

Commit 3a03dca

Browse files
bors[bot]meili-bot
andauthored
Merge #730
730: Restructure the CONTRIBUTING.md r=curquiza a=meili-bot _This PR is auto-generated._ Related to this issue: meilisearch/integration-guides#51 Co-authored-by: meili-bot <[email protected]>
2 parents ae4807d + 2f9f3b3 commit 3a03dca

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

CONTRIBUTING.md

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ First of all, thank you for contributing to MeiliSearch! The goal of this docume
88
- [How to Contribute](#how-to-contribute)
99
- [Development Workflow](#development-workflow)
1010
- [Git Guidelines](#git-guidelines)
11+
- [Release Process (for Admin only)](#release-process-for-admin-only)
1112

1213
<!-- /MarkdownTOC -->
1314

@@ -23,7 +24,7 @@ First of all, thank you for contributing to MeiliSearch! The goal of this docume
2324
2. Once done, [fork the meilisearch-js repository](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) in your own GitHub account. Ask a maintainer if you want your issue to be checked before making a PR.
2425
3. [Create a new Git branch](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-and-deleting-branches-within-your-repository).
2526
4. Review the [Development Workflow](#workflow) section that describes the steps to maintain the repository.
26-
5. Make your changes.
27+
5. Make the changes on your branch.
2728
6. [Submit the branch as a PR](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork) pointing to the `master` branch of the main meilisearch-js repository. A maintainer should comment and/or review your Pull Request within a few days. Although depending on the circumstances, it may take longer.<br>
2829
We do not enforce a naming convention for the PRs, but **please use something descriptive of your changes**, having in mind that the title of your PR will be automatically added to the next [release changelog](https://github.com/meilisearch/meilisearch-js/releases/).
2930

@@ -52,36 +53,6 @@ $ yarn style:fix
5253
$ yarn build
5354
```
5455

55-
### Release Process
56-
57-
MeiliSearch tools follow the [Semantic Versioning Convention](https://semver.org/).
58-
59-
#### Automated Changelogs
60-
61-
For each PR merged on `master`, a GitHub Action is running and updates the next release description as a draft release in the [GitHub interface](https://github.com/meilisearch/meilisearch-js/releases). If you don't have the right access to this repository, you will not be able to see the draft release until the release is published.
62-
63-
The draft release description is therefore generated and corresponds to all the PRs titles since the previous release. This means each PR should only do one change and the title should be descriptive of this change.
64-
65-
About this automation:
66-
- As the draft release description is generated on every push on `master`, don't change it manually until the final release publishment.
67-
- If you don't want a PR to appear in the release changelogs: add the label `skip-changelog`. We suggest removing PRs updating the README or the CI (except for big changes).
68-
- If the changes you are doing in the PR are breaking: add the label `breaking-change`. In the release tag, the minor will be increased instead of the patch. The major will never be changed until [MeiliSearch](https://github.com/meilisearch/MeiliSearch) is stable.
69-
- If you did any mistake, for example the PR is already closed but you forgot to add a label or you misnamed your PR, don't panic: change what you want in the closed PR and run the job again.
70-
71-
*More information about the [Release Drafter](https://github.com/release-drafter/release-drafter), used to automate these steps.*
72-
73-
#### How to Publish the Release
74-
75-
Make a PR modifying the file [`package.json`](/package.json) with the right version.
76-
77-
```javascript
78-
"version": "X.X.X",
79-
```
80-
81-
Once the changes are merged on `master`, you can publish the current draft release via the [GitHub interface](https://github.com/meilisearch/meilisearch-js/releases).
82-
83-
A GitHub Action will be triggered and push the package to [npm](https://www.npmjs.com/package/meilisearch).
84-
8556
## Git Guidelines
8657

8758
### Git Branches
@@ -102,10 +73,39 @@ We don't follow any other convention, but if you want to use one, we recommend [
10273
### GitHub Pull Requests
10374

10475
Some notes on GitHub PRs:
76+
10577
- [Convert your PR as a draft](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/changing-the-stage-of-a-pull-request) if your changes are a work in progress: no one will review it until you pass your PR as ready for review.<br>
10678
The draft PR can be very useful if you want to show that you are working on something and make your work visible.
107-
- The branch related to the PR must be **up-to-date with `master`** before merging. [Bors](https://github.com/bors-ng/bors-ng) will rebase your branch if it is not. Ask a maintainer to run it.
79+
- The branch related to the PR must be **up-to-date with `master`** before merging. Fortunately, this project [integrates a bot](https://github.com/meilisearch/integration-guides/blob/master/guides/bors.md) to automatically enforce this requirement without the PR author having to do it manually..
10880
- All PRs must be reviewed and approved by at least one maintainer.
10981
- The PR title should be accurate and descriptive of the changes. The title of the PR will be indeed automatically added to the next [release changelogs](https://github.com/meilisearch/meilisearch-js/releases/).
11082

83+
## Release Process (for Admin only)
84+
85+
MeiliSearch tools follow the [Semantic Versioning Convention](https://semver.org/).
86+
87+
### Automation to Rebase and Merge the PRs
88+
89+
This project integrates a bot that helps us manage pull requests merging.<br>
90+
_[Read more about this](https://github.com/meilisearch/integration-guides/blob/master/guides/bors.md)._
91+
92+
### Automated Changelogs
93+
94+
This project integrates a tool to create automated changelogs.<br>
95+
_[Read more about this](https://github.com/meilisearch/integration-guides/blob/master/guides/release-drafter.md)._
96+
97+
### How to Publish the Release
98+
99+
Make a PR modifying the file [`package.json`](/package.json) with the right version.
100+
101+
```javascript
102+
"version": "X.X.X",
103+
```
104+
105+
Once the changes are merged on `master`, you can publish the current draft release via the [GitHub interface](https://github.com/meilisearch/meilisearch-js/releases).
106+
107+
GitHub Actions will be triggered and push the package to [npm](https://www.npmjs.com/package/meilisearch).
108+
109+
<hr>
110+
111111
Thank you again for reading this through, we can not wait to begin to work with you if you made your way through this contributing guide ❤️

0 commit comments

Comments
 (0)