cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

CONTRIBUTING.md: change table column order for staging

Browse source 
The graph right above the table has the order as `master` ⇒ `staging-next` ⇒ `staging`.
This corresponds with the workflow, i.e. automatic merges happen in that direction and the manual merging is in reverse direction of that.
As a first time reader of this document the table was very confusing due to the disparity of that.
With this change the table should read more fluently for people not familiar with the workflow since the table follows the step-by-step flow of commits.

Signed-off-by: benaryorg <binary@benary.org>
This commit is contained in:
benaryorg 2024-02-23 17:28:16 +00:00
parent b093dd8294
commit c3b66ce3cc
No known key found for this signature in database
GPG key ID: E2F22C5EDF20119D
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
CONTRIBUTING.md
View file

@ -439,14 +439,14 @@ gitGraph
Here's an overview of the different branches: Here's an overview of the different branches:
| branch | `master` | `staging` | `staging-next` | | branch | `master` | `staging-next` | `staging` |
| --- | --- | --- | --- | | --- | --- | --- | --- |
| Used for development | ✔️ | ✔️ | ❌ | | Used for development | ✔️ | ❌ | ✔️ |
| Built by Hydra | ✔️ | ❌ | ✔️ | | Built by Hydra | ✔️ | ✔️ | ❌ |
| [Mass rebuilds][mass-rebuild] | ❌ | ✔️ | ⚠️ Only to fix Hydra builds | | [Mass rebuilds][mass-rebuild] | ❌ | ⚠️ Only to fix Hydra builds | ✔️ |
| Critical security fixes | ✔️ for non-mass-rebuilds | ❌ | ✔️ for mass-rebuilds | | Critical security fixes | ✔️ for non-mass-rebuilds | ✔️ for mass-rebuilds | ❌ |
| Automatically merged into | `staging-next` | - | `staging` | | Automatically merged into | `staging-next` | `staging` | - |
| Manually merged into | - | `staging-next` | `master` | | Manually merged into | - | `master` | `staging-next` |
The staging workflow is used for all main branches, `master` and `release-YY.MM`, with corresponding names: The staging workflow is used for all main branches, `master` and `release-YY.MM`, with corresponding names:
- `master`/`release-YY.MM` - `master`/`release-YY.MM`