From a179184555d534d5354004639e791afb050e4b57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@nekox.me>
Date: Mon, 18 May 2020 14:16:27 +0800
Subject: [PATCH] [RELEASE] 6.1.1.2

---
 .github/workflows/master.yml  |  2 +-
 .github/workflows/release.yml | 12 ++++++------
 TMessagesProj/build.gradle    |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 703b5dcc6..790a466ae 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -9,7 +9,7 @@ jobs:
   alapaBuild:
     name: Alapa Build
     runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, '[S]')"
+    if: "!contains(github.event.head_commit.message, '[S]') && !contains(github.event.head_commit.message, '[RELEASE]') && !contains(github.event.head_commit.message, '[N]')"
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v1
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cb5556bd5..0ed375f33 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -28,12 +28,6 @@ jobs:
                     TMessagesProj:assembleReleaseNoGcm \
                     TMessagesProj:bundleFullRelease
           echo ::set-env name=AAB_FILE::$(find TMessagesProj/build/outputs/bundle -name "*.aab")
-      - uses: r0adkll/upload-google-play@master
-        with:
-          serviceAccountJsonPlainText: ${{ secrets.GOOGLE_ACCOUNT_SERVICE }}
-          packageName: nekox.messenger
-          releaseFile:  ${{ env.AAB_FILE }}
-          track: production
       - name: Setup ghr
         run: |
           wget -O ghr.tar.gz https://github.com/tcnksm/ghr/releases/download/v0.13.0/ghr_v0.13.0_linux_amd64.tar.gz
@@ -67,3 +61,9 @@ jobs:
           git commit -m 喵
           git push github master -f
           git push gitlab master -f
+      - uses: r0adkll/upload-google-play@master
+        with:
+          serviceAccountJsonPlainText: ${{ secrets.GOOGLE_ACCOUNT_SERVICE }}
+          packageName: nekox.messenger
+          releaseFile:  ${{ env.AAB_FILE }}
+          track: production
\ No newline at end of file
diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
index 97b5d6909..8fc92d523 100644
--- a/TMessagesProj/build.gradle
+++ b/TMessagesProj/build.gradle
@@ -75,8 +75,8 @@ dependencies {
 
 }
 
-def verName = "6.1.1.2-rc01"
-def verCode = 39
+def verName = "6.1.1.2"
+def verCode = 40
 
 task writeUpdateInfo {