From 262b331afd2653b5a43b2c66472004a73498cbed Mon Sep 17 00:00:00 2001 From: epoberezkin Date: Mon, 19 Oct 2026 08:08:31 +0000 Subject: [PATCH] deploy: bdc4edc524de9fea751e6b19e459804347ec3fde --- docs/contributing.html | 31 +++++++------------------------ docs/contributing.md | 17 ++++------------- 2 files changed, 11 insertions(+), 37 deletions(-) diff --git a/docs/contributing.html b/docs/contributing.html index a189bbe90b..66b8188e31 100644 --- a/docs/contributing.html +++ b/docs/contributing.html @@ -1057,13 +1057,7 @@ window.addEventListener('click',(e)=>{

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

    @@ -1076,31 +1070,20 @@ window.addEventListener('click',(e)=>{

    Make PRs to master branch only for both simplex-chat and simplexmq repos.

  • -

    To build core libraries for Android, iOS and Windows:

    +

    To build core libraries for Android, iOS and Windows, push master branch to GitHub.

    • - - -
    1. -

      All libraries should be built from master branch, Android armv7a - from master-android branch.

      +

      All libraries should be built from master branch.

    2. To build Desktop and CLI apps, make tag in master branch, APK files should be attached to the release.

    3. -

      After the public release to App Store and Play Store, merge:

      +

      After the public release to App Store and Play Store, merge master to stable.

      +
      4. +
    4. +

      Independently, master branch of simplexmq repo should be merged to stable branch on stable releases.

      5. -
    - -
      -
    1. Independently, master branch of simplexmq repo should be merged to stable branch on stable releases.

    Branches and PRs

    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.

    diff --git a/docs/contributing.md b/docs/contributing.md index 771e123f86..06fa1426d8 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -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.