You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: CONTRIBUTING.md
+27-28Lines changed: 27 additions & 28 deletions
Original file line number
Diff line number
Diff line change
@@ -8,6 +8,7 @@ First of all, thank you for contributing to MeiliSearch! The goal of this docume
8
8
-[How to Contribute](#how-to-contribute)
9
9
-[Development Workflow](#development-workflow)
10
10
-[Git Guidelines](#git-guidelines)
11
+
-[Release Process (for Admin only)](#release-process-for-admin-only)
11
12
12
13
<!-- /MarkdownTOC -->
13
14
@@ -23,7 +24,7 @@ First of all, thank you for contributing to MeiliSearch! The goal of this docume
23
24
2. Once done, [fork the docs-scraper 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.
24
25
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).
25
26
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.
27
28
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 docs-scraper 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>
28
29
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 changelogs](https://github.com/meilisearch/docs-scraper/releases/).
29
30
@@ -52,30 +53,6 @@ $ pipenv run pylint scraper
52
53
$ pipenv run pytest ./scraper/src -k "not _browser"
53
54
```
54
55
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/docs-scraper/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
-
Once the changes are merged on `master`, you can publish the current draft release via the [GitHub interface](https://github.com/meilisearch/docs-scraper/releases).
76
-
77
-
A GitHub Action will be triggered and push the `latest` and `vX.X.X` version of the Docker image to [DockerHub](https://hub.docker.com/repository/docker/getmeili/docs-scraper).
78
-
79
56
## Git Guidelines
80
57
81
58
### Git Branches
@@ -96,11 +73,33 @@ We don't follow any other convention, but if you want to use one, we recommend [
96
73
### GitHub Pull Requests
97
74
98
75
Some notes on GitHub PRs:
76
+
99
77
-[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>
100
78
The draft PR can be very useful if you want to show that you are working on something and make your work visible.
101
-
- The branch related to the PR must be **up-to-date with `master`** before merging. You need to [rebase your branch](https://gist.github.com/curquiza/5f7ce615f85331f083cd467fc4e19398) if it is not.
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..
102
80
- All PRs must be reviewed and approved by at least one maintainer.
103
-
- All PRs have to be **squashed and merged**.
104
-
- 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 changlogs](https://github.com/meilisearch/docs-scraper/releases/).
81
+
- 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/docs-scraper/releases/).
82
+
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
+
Once the changes are merged on `master`, you can publish the current draft release via the [GitHub interface](https://github.com/meilisearch/docs-scraper/releases).
100
+
101
+
GitHub Actions will be triggered and push the `latest` and `vX.X.X` version of the Docker image to [DockerHub](https://hub.docker.com/repository/docker/getmeili/docs-scraper).
102
+
103
+
<hr>
105
104
106
105
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