Gerald 3 лет назад
Родитель
Сommit
ff79823dee
2 измененных файлов с 33 добавлено и 14 удалено
  1. 4 14
      README.md
  2. 29 0
      RELEASE.md

+ 4 - 14
README.md

@@ -38,9 +38,9 @@ $ yarn dev
 
 Then load the extension from 'dist/'.
 
-### Building
+### Build
 
-After a new (pre)release is created, we should build the project and upload to web stores.
+To release a new version, we must build the assets and upload them to web stores.
 
 ``` sh
 # Build for normal releases
@@ -50,19 +50,9 @@ $ yarn build
 $ yarn build:selfHosted
 ```
 
-## Release
+### Release
 
-Just create a tag and push it.
-
-When a tag is pushed to GitHub, a (pre)release will be created with assets built by GitHub Actions.
-
-```sh
-# Create a prerelease
-$ yarn bump
-
-# Create a patch release
-$ yarn version --patch
-```
+See [RELEASE](RELEASE.md) for the release flow.
 
 ## Related Projects
 

+ 29 - 0
RELEASE.md

@@ -0,0 +1,29 @@
+# Release
+
+Create a tag and push, GitHub Actions will build the assets and upload them to different stores.
+
+## Prerelease
+
+```bash
+$ git checkout master
+$ yarn bump
+$ git push origin master --follow-tags
+```
+
+## Release
+
+Merge everything that is ready to release to the `release` branch and bump version.
+
+```bash
+$ git checkout release
+$ git merge master # or git merge v2.13.2.2
+$ yarn version --patch
+$ git push origin release --follow-tags
+```
+
+Finally merge `release` back to `master`.
+
+```bash
+$ git checkout master
+$ git merge release
+```