Merge pull request #72 from nextcloud/feat/visualize-versioning

feat: Visualize branching and versioning
This commit is contained in:
Christoph Wurst 2023-08-04 11:49:02 +02:00 коммит произвёл GitHub
Родитель 3c1086a42c bb26539638
Коммит 378da10f71
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
1 изменённых файлов: 30 добавлений и 0 удалений

30
.github/resources/app_branching_strategy.md поставляемый Normal file
Просмотреть файл

@ -0,0 +1,30 @@
# Groupware App Branching Strategy
This document gives an overview of how git branches and tags are used for Groupware apps.
## Versioning
All modifications go into `main` first. `main` is used for all pre-releases. At RC1, a *stable branch* is created from HEAD of `main`. `main` targets the next minor or major release after this branch-off. The stable branch is used to finalize the stabilization of the minor/major release. Once the first .0 version is out, all future patch releases are created from the stable branch directly. If there is a pre-release for a patch release, it's done on the stable branch directly (v5.8.2 below).
```mermaid
gitGraph
commit id: "v5.8.0-alpha1"
commit id: "v5.8.0-alpha2"
commit id: "v5.8.0-beta1"
commit id: "v5.8.0-beta2"
commit id: "v5.8.0-rc1"
branch stable5.8
checkout main
commit id: "v5.9.0-alpha1"
checkout stable5.8
commit id: "v5.8.0-rc2"
commit id: "v5.8.0"
checkout main
commit id: "v5.9.0-alpha2"
checkout stable5.8
commit id: "v5.8.1"
commit id: "v5.8.2-rc1"
commit id: "v5.8.2"
checkout main
commit id: "v5.9.0-beta1"
```