From b6c9edba2143baf99ddd983043bc4bf85f9bb770 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Sun, 16 May 2021 17:50:50 +0200 Subject: [PATCH 1/2] Tools: Make sure branch has been pushed before releasing Android version --- packages/tools/release-android.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/tools/release-android.js b/packages/tools/release-android.js index 6f708a5d2..5bdac54c6 100644 --- a/packages/tools/release-android.js +++ b/packages/tools/release-android.js @@ -1,5 +1,5 @@ const fs = require('fs-extra'); -const { execCommandVerbose, execCommandWithPipes, githubRelease, githubOauthToken, fileExists } = require('./tool-utils.js'); +const { execCommandVerbose, execCommandWithPipes, githubRelease, githubOauthToken, fileExists, gitPullTry } = require('./tool-utils.js'); const path = require('path'); const fetch = require('node-fetch'); const uriTemplate = require('uri-template'); @@ -141,6 +141,8 @@ async function main() { if (!['release', 'prerelease'].includes(argv.type)) throw new Error('Must specify release type. Either --type=release or --type=prerelease'); + await gitPullTry(false); + const isPreRelease = argv.type === 'prerelease'; if (isPreRelease) console.info('Creating pre-release'); From b01f82bb33e08ebd236467ee193de9b3683fd9a4 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Sun, 16 May 2021 17:54:13 +0200 Subject: [PATCH 2/2] Android release v2.0.1 --- packages/app-mobile/android/app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/app-mobile/android/app/build.gradle b/packages/app-mobile/android/app/build.gradle index 85283ce31..2d74e3d5e 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 2097631 - versionName "2.0.0" + versionCode 2097632 + versionName "2.0.1" ndk { abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64" }