Skip to content

Commit

Permalink
docs: Update Deployment
Browse files Browse the repository at this point in the history
  • Loading branch information
ffflorian committed May 26, 2020
1 parent 766dfe4 commit 36a4938
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions README.md
Expand Up @@ -47,14 +47,12 @@ yarn test

### Deployment

#### General workflow

| Stage | Branch | Action | Version |
| :-- | :-- | :-- | :-- |
| 1 (Feature development) | (varies) | commit | x.y+3.0 (e.g. 3.20.0) |
| 2 (Nightly test automation) | [dev](https://github.com/wireapp/wire-desktop/tree/dev) | commit or squash merge from feature branch | x.y+2.0 (e.g. 3.19.0) |
| 3 (Internal release) | [staging](https://github.com/wireapp/wire-desktop/tree/staging) | merge (don't squash) from [dev](https://github.com/wireapp/wire-desktop/tree/dev) | x.y+1.0 (e.g. 3.18.0) |
| 5 (Production release) | [master](https://github.com/wireapp/wire-desktop/tree/master) | merge (don't squash) from [staging](https://github.com/wireapp/wire-desktop/tree/staging) | x.y.0 (e.g. 3.17.0) |
| 1 (Feature development) | (varies) | commit | x.y+3 (e.g. 3.20) |
| 2 (Nightly test automation) | [dev](https://github.com/wireapp/wire-desktop/tree/dev) | commit or squash merge from feature branch | x.y+2 (e.g. 3.19) |
| 3 (Internal release) | [staging](https://github.com/wireapp/wire-desktop/tree/staging) | merge (don't squash) from [dev](https://github.com/wireapp/wire-desktop/tree/dev) | x.y+1 (e.g. 3.18) |
| 4 (Production release) | [master](https://github.com/wireapp/wire-desktop/tree/master) | merge (don't squash) from [staging](https://github.com/wireapp/wire-desktop/tree/staging) | x.y (e.g. 3.17) |

### Tasks

Expand Down

0 comments on commit 36a4938

Please sign in to comment.