From 0dca1b727d0ba01e6e0b89f8c12b6b4094d28dff Mon Sep 17 00:00:00 2001
From: Ali <>
Date: Tue, 6 Apr 2021 02:53:32 +0400
Subject: [PATCH] Add hotfix branch

---
 .github/workflows/build.yml | 4 +++-
 .gitlab-ci.yml              | 4 ++++
 build_number_offset         | 1 +
 buildbox/build-telegram.sh  | 3 ++-
 4 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 build_number_offset

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 34d314c55e..dcf2761983 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,9 +48,11 @@ jobs:
 
           cd $SOURCE_DIR
 
+          BUILD_NUMBER_OFFSET="$(cat build_number_offset)"
+
           export APP_VERSION=$(cat versions.json | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["app"]);')
           export COMMIT_COUNT=$(git rev-list --count HEAD)
-          export COMMIT_COUNT="$(($COMMIT_COUNT+2000))"
+          export COMMIT_COUNT="$(($COMMIT_COUNT+$BUILD_NUMBER_OFFSET))"
           export BUILD_NUMBER="$COMMIT_COUNT"
           echo "BUILD_NUMBER=$(echo $BUILD_NUMBER)" >> $GITHUB_ENV
           echo "APP_VERSION=$(echo $APP_VERSION)" >> $GITHUB_ENV
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b8cad4dbc1..153e1667a4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,6 +70,7 @@ beta_testflight:
   stage: build
   only:
     - beta
+    - hotfix
   except:
     - tags
   script:
@@ -87,6 +88,7 @@ deploy_beta_testflight:
   stage: deploy
   only:
     - beta
+    - hotfix
   except:
     - tags
   script:
@@ -100,6 +102,7 @@ verifysanity_beta_testflight:
   stage: verifysanity
   only:
     - beta
+    - hotfix
   except:
     - tags
   script:
@@ -118,6 +121,7 @@ verify_beta_testflight:
   stage: verify
   only:
     - beta
+    - hotfix
   except:
     - tags
   script:
diff --git a/build_number_offset b/build_number_offset
new file mode 100644
index 0000000000..29d6383b52
--- /dev/null
+++ b/build_number_offset
@@ -0,0 +1 @@
+100
diff --git a/buildbox/build-telegram.sh b/buildbox/build-telegram.sh
index 70b300f4ae..f2bc29956c 100644
--- a/buildbox/build-telegram.sh
+++ b/buildbox/build-telegram.sh
@@ -79,7 +79,8 @@ COMMIT_ID="$(git rev-parse HEAD)"
 COMMIT_AUTHOR=$(git log -1 --pretty=format:'%an')
 if [ -z "$2" ]; then
 	COMMIT_COUNT=$(git rev-list --count HEAD)
-	COMMIT_COUNT="$(($COMMIT_COUNT+2000))"
+	BUILD_NUMBER_OFFSET="$(cat build_number_offset)"
+	COMMIT_COUNT="$(($COMMIT_COUNT+$BUILD_NUMBER_OFFSET))"
 	BUILD_NUMBER="$COMMIT_COUNT"
 else
 	BUILD_NUMBER="$2"