|
|
This page describes Kea project workflow. Everyone who contribute to Kea project is expected to read it at least once. The name of this page is a bit misleading. A better name would be `Development process in the Kea project`, but it is what it is for historical reasons. (_If you're curious, long, long time ago we were using stand alone git with trac, and this page was intially explaining the differences compared to our old process once we migrated to gitlab. Here's the name._)
|
|
|
This page describes Kea project workflow. Everyone who contribute to Kea project is expected to read it at least once. The name of this page is a bit misleading. A better name would be `Development process in the Kea project`, but it is what it is for historical reasons. (_If you're curious, long, long time ago we were using stand alone git with trac, and this page was initially explaining the differences compared to our old process once we migrated to gitlab. Here's the name._)
|
|
|
|
|
|
# Gitlab setup
|
|
|
- create an account if you don't have it yet.
|
... | ... | @@ -54,7 +54,7 @@ cd kea |
|
|
|
|
|
- Kea project is currently set up in a way that allows only fast-forward merges. This is not the only possible option, it looks like the right way to go. It keeps the repo history much cleaner. If you complain about tons of merge conflicts, you tried to push a ticket that was too big.
|
|
|
|
|
|
- We do have a Gitlab CI in place that uses several tooks. If you see the pipeline failing, you won't be able to merge anything. Please fix the issue before merging. Before merging, please run unit-tests on your own.
|
|
|
- We do have a Gitlab CI in place that uses several hooks. If you see the pipeline failing, you won't be able to merge anything. Please fix the issue before merging. Before merging, please run unit-tests on your own.
|
|
|
|
|
|
- Using rebase button on MR page is a very nice way of rebasing your branch. If there are conflicts, here's how you can rebase the code:
|
|
|
```console
|
... | ... | @@ -226,7 +226,7 @@ lib4 version 7.0.0 (unchanged) - nothing merged from development into stable rel |
|
|
kea-2.1.2
|
|
|
lib1 version 10.0.0 (unchanged)
|
|
|
lib2 version 17.0.0 (add 1 because the code has changed yet again)
|
|
|
lib3 version 34.0.0
|
|
|
lib3 version 34.0.0
|
|
|
lib4 version 18.0.0
|
|
|
```
|
|
|
|
... | ... | |