dandri/simplex-chat
1
0 Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-10-24 17:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

deploy: bdc4edc524

Browse Source
This commit is contained in:
epoberezkin committed 2026-10-19 08:08:31 +00:00
1 parent 0b51e06ccb
commit 262b331afd
2 files changed
+11 -37
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

docs/contributing.html
+7 -24
View File
@@ -1057,13 +1057,7 @@ window.addEventListener('click',(e)=>{
<p><code>stable</code> - stable release of the apps, can be used for updates to the previous stable release (GHC 9.6.3).</p>
</li>
<li>
<p><code>stable-android</code> - used to build stable Android core library with Nix (GHC 8.10.7) - only for Android armv7a.</p>
</li>
<li>
<p><code>master</code> - branch for beta version releases (compatible with both GHC 9.6.3 and 8.10.7).</p>
</li>
<li>
<p><code>master-android</code> - used to build beta Android core library with Nix (GHC 8.10.7) - only for Android armv7a.</p>
<p><code>master</code> - branch for beta version releases (compatible with both GHC 9.6.3 and 8.10.7). Nix builds Android armv7a core library with GHC 8.10.7 and all other core libraries with GHC 9.6.3.</p>
</li>
</ul>
<p><strong>In simplexmq repo</strong></p>
@@ -1076,31 +1070,20 @@ window.addEventListener('click',(e)=>{
<p>Make PRs to <code>master</code> branch <em>only</em> for both simplex-chat and simplexmq repos.</p>
</li>
<li>
<p>To build core libraries for Android, iOS and Windows:</p>
<p>To build core libraries for Android, iOS and Windows, push <code>master</code> branch to GitHub.</p>
</li>
</ol>
<ul>
<li>merge <code>master</code> branch to <code>master-android</code> branch.</li>
<li>push to GitHub.</li>
</ul>
<ol start="3">
<li>
<p>All libraries should be built from <code>master</code> branch, Android armv7a - from <code>master-android</code> branch.</p>
<p>All libraries should be built from <code>master</code> branch.</p>
</li>
<li>
<p>To build Desktop and CLI apps, make tag in <code>master</code> branch, APK files should be attached to the release.</p>
</li>
<li>
<p>After the public release to App Store and Play Store, merge:</p>
<p>After the public release to App Store and Play Store, merge <code>master</code> to <code>stable</code>.</p>
</li>
<li>
<p>Independently, <code>master</code> branch of simplexmq repo should be merged to <code>stable</code> branch on stable releases.</p>
</li>
</ol>
<ul>
<li><code>master</code> to <code>stable</code></li>
<li><code>master</code> to <code>master-android</code> (and compile/update code)</li>
<li><code>master-android</code> to <code>stable-android</code></li>
</ul>
<ol start="6">
<li>Independently, <code>master</code> branch of simplexmq repo should be merged to <code>stable</code> branch on stable releases.</li>
</ol>
<h2 id="branches-and-prs" tabindex="-1">Branches and PRs</h2>
<p>Use change scope (or comma separated scopes) as the first word in the PR names, followed by the colon. Commit name itself should be lowercase, in present tense.</p>
docs/contributing.md
+4 -13
View File
@@ -52,11 +52,7 @@ You will have to add `/opt/homebrew/opt/openssl@3.0/bin` to your PATH in order t
- `stable` - stable release of the apps, can be used for updates to the previous stable release (GHC 9.6.3).
- `stable-android` - used to build stable Android core library with Nix (GHC 8.10.7) - only for Android armv7a.
- `master` - branch for beta version releases (compatible with both GHC 9.6.3 and 8.10.7).
- `master-android` - used to build beta Android core library with Nix (GHC 8.10.7) - only for Android armv7a.
- `master` - branch for beta version releases (compatible with both GHC 9.6.3 and 8.10.7). Nix builds Android armv7a core library with GHC 8.10.7 and all other core libraries with GHC 9.6.3.
**In simplexmq repo**
@@ -66,18 +62,13 @@ You will have to add `/opt/homebrew/opt/openssl@3.0/bin` to your PATH in order t
1. Make PRs to `master` branch _only_ for both simplex-chat and simplexmq repos.
2. To build core libraries for Android, iOS and Windows:
- merge `master` branch to `master-android` branch.
- push to GitHub.
2. To build core libraries for Android, iOS and Windows, push `master` branch to GitHub.
3. All libraries should be built from `master` branch, Android armv7a - from `master-android` branch.
3. All libraries should be built from `master` branch.
4. To build Desktop and CLI apps, make tag in `master` branch, APK files should be attached to the release.
5. After the public release to App Store and Play Store, merge:
- `master` to `stable`
- `master` to `master-android` (and compile/update code)
- `master-android` to `stable-android`
5. After the public release to App Store and Play Store, merge `master` to `stable`.
6. Independently, `master` branch of simplexmq repo should be merged to `stable` branch on stable releases.