... | ... | @@ -104,7 +104,7 @@ If you are in doubt it's **always ok to remove "Draft"**. A MR not marked ready |
|
|
|
|
|
Worst case a maintainer will mark it as Draft again if they think it's up to you to make changes to the MR before moving forward.
|
|
|
|
|
|
### 4. Modifying the validation pipeline
|
|
|
## 5. Modifying the validation pipeline
|
|
|
|
|
|
By default we run a selected few jobs in each merge request on the most common platforms.
|
|
|
|
... | ... | @@ -120,7 +120,7 @@ You can use *labels* to modify the configurations which are tested on a merge re |
|
|
|
|
|
You apply a label using the "Labels" button in the right hand column.
|
|
|
|
|
|
## 5. Merging your merge request
|
|
|
## 6. Merging your merge request
|
|
|
|
|
|
We use @marge-bot to automatically rebase and merge branches to `master`.
|
|
|
After your merge request has been reviewed and approved, you can request that it be added to the merge queue by @-mentioning @reviewers. Your MR should be added to the merge queue within a day or two, assuming it passes CI and the commit history is in order (individually buildable commits with informative commit messages).
|
... | ... | @@ -133,11 +133,11 @@ As long as your MR satisfies the following, GitLab will batch your MR with other |
|
|
|
|
|
Each batch is an MR of its own, which must itself pass CI. You can expect GitLab to merge two or three batches per day.
|
|
|
|
|
|
### 6. Rebasing
|
|
|
### 7. Rebasing
|
|
|
|
|
|
You generally do *not* need to rebase your MRs unless there are merge conflicts with `master`. GitLab will automatically rebase on top of `master` when batching MRs.
|
|
|
|
|
|
## 7. Backports
|
|
|
## 8. Backports
|
|
|
|
|
|
After a patch has made it to `master` it might be appropriate to backport it to the stable branch (e.g. `ghc-8.8`). If backporting is desired first ensure that the issue is milestoned for the next minor release and mark the merge request containing the fix with the appropriate "backport needed" label(s) (e.g. ~"backport needed:8.8").
|
|
|
|
... | ... | |