From f0ad813f40f659eb77416e12b83109d7aef0ff1b Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Thu, 12 Aug 2021 21:26:29 +0100 Subject: [PATCH] Tools: remove git pull from Android release script, which can make upload fail --- packages/app-mobile/android/app/build.gradle | 4 ++-- packages/tools/release-android.ts | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/app-mobile/android/app/build.gradle b/packages/app-mobile/android/app/build.gradle index 5987c4a806..a1f9e26ee3 100644 --- a/packages/app-mobile/android/app/build.gradle +++ b/packages/app-mobile/android/app/build.gradle @@ -141,8 +141,8 @@ android { applicationId "net.cozic.joplin" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 2097644 - versionName "2.3.0" + versionCode 2097645 + versionName "2.3.1" ndk { abiFilters "armeabi-v7a", "x86" } diff --git a/packages/tools/release-android.ts b/packages/tools/release-android.ts index ec5df7b511..0126d7790c 100644 --- a/packages/tools/release-android.ts +++ b/packages/tools/release-android.ts @@ -173,8 +173,6 @@ async function main() { await fs.writeFile(`${rootDir}/README.md`, readmeContent); } - await execCommandVerbose('git', ['pull']); - // NOT TESTED: These commands should not be necessary anymore since they are // done in completeReleaseWithChangelog()