Skip to content

Commit 9b34fab

Browse files
committed
update contributing
1 parent 898eefc commit 9b34fab

File tree

1 file changed

+33
-14
lines changed

1 file changed

+33
-14
lines changed

CONTRIBUTING.md

+33-14
Original file line numberDiff line numberDiff line change
@@ -62,26 +62,45 @@ Windows store version is built as a Desktop Bridge app (with `runFullTrust` capa
6262

6363
## Releasing
6464

65-
For per-platform build/signing setup, see [this article](https://mifi.no/blog/automated-electron-build-with-release-to-mac-app-store-microsoft-store-snapcraft/).
66-
67-
### Release new version
68-
69-
- If Mac App Store / Windows Store
70-
- Checkout branch `stores`
71-
- Merge `master` into `stores`
72-
- `npm version ...`
65+
### Build new version
66+
67+
- `git checkout master`
68+
- `git merge stores` (in case there's an old unmerged stores hotfix)
69+
- *If Store-only hotfix release*
70+
- `git checkout stores`
71+
- `npm version patch`
72+
- *If normal GitHub-first release*
73+
- `npm version minor`
7374
- `git push --follow-tags`
7475
- Wait for build and draft in Github actions
76+
77+
### Release built version
78+
7579
- Open draft in github and add Release notes
7680
- For files `LosslessCut-mac-universal.pkg` and `LosslessCut-win-x64.appx` add prefix `-DO-NOT-DOWNLOAD`
77-
- If intended as Github, release the draft
78-
- If store-only release, release the draft as **pre-release**
81+
- *If GitHub release*
82+
- Release the draft
83+
- *If Store-only hotfix release*
84+
- Remove all other artifacts and release the draft as **pre-release**
7985

80-
### After release
86+
#### After releasing on GitHub
8187

82-
- If Mac App Store / Windows Store
83-
- Merge `stores` into `master`
84-
- Bump [snap version](https://snapcraft.io/losslesscut/listing)
88+
- *If Stores-only hotfix release*
89+
- `git checkout master`
90+
- `git merge stores`
91+
- Bump [snap version](https://snapcraft.io/losslesscut/releases)
92+
93+
### After releasing existing GitHub version in Stores
94+
95+
- `git checkout stores`
96+
- Find the tag just released in the Stores
97+
- Merge this tag (from `master`) into `stores`: `git merge vX.Y.Z`
98+
- `git push`
99+
- `git checkout master`
100+
101+
### More info
102+
103+
For per-platform build/signing setup, see [this article](https://mifi.no/blog/automated-electron-build-with-release-to-mac-app-store-microsoft-store-snapcraft/).
85104

86105
## Weblate
87106

0 commit comments

Comments
 (0)