From 7bee8ae732e8012399dbcbcb25f53aaf3837ae2c Mon Sep 17 00:00:00 2001 From: Brandon Presley Date: Thu, 5 Jan 2023 16:35:53 +1300 Subject: [PATCH] Try amending last commit for deployment script - 1.112 By including the version name in the last commit, if that commit references an issue users now know what version number to expect the fix in. --- android/app/build.gradle | 4 ++-- deploy.sh | 3 ++- package.json | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index f65cfb8..cd64a1e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -41,8 +41,8 @@ android { missingDimensionStrategy "RNNotifications.reactNativeVersion", "reactNative60" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 36137 - versionName "1.111" + versionCode 36138 + versionName "1.112" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() if (isNewArchitectureEnabled()) { diff --git a/deploy.sh b/deploy.sh index 23c8ec2..915b95e 100755 --- a/deploy.sh +++ b/deploy.sh @@ -34,7 +34,8 @@ bundle install bundle exec fastlane supply --aab app/build/outputs/bundle/release/app-release.aab git add app/build.gradle ../package.json -git commit --no-verify --message "Set versionCode=$versionCode,versionName=$major.$minor" +git commit --amend --message \ + "$(git log -1 --pretty=%B | sed " 1 s/.*/& - $major.$minor/")" git tag "$versionCode" git push origin HEAD & git push --tags diff --git a/package.json b/package.json index 8b3c027..10d4f7f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "massive", - "version": "1.111", + "version": "1.112", "private": true, "license": "GPL-3.0-only", "scripts": {