ci: fix ios and android build number, make push (#425)

GaloyMoney · Mar 31, 2022 · 611d629 · 611d629
1 parent 2ccb5db
commit 611d629
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -139,6 +139,7 @@ jobs:
           paths:
             - node_modules
             - ios/Pods
+      - run: git checkout main
       - run: yarn jest
       - run: sed -i'' -e "s/GOOGLE_SERVICE_FIREBASE_API_KEY/$GOOGLE_SERVICE_FIREBASE_API_KEY/" ios/GoogleService-Info.plist
       - run: sed -i'' -e "s/MARKETING_VERSION.*/MARKETING_VERSION = $CIRCLE_TAG;/g" ios/GaloyApp.xcodeproj/project.pbxproj
@@ -206,20 +207,11 @@ jobs:
           paths:
             - node_modules
 
+      - run: git checkout main
       - run: echo $JAVA_OPTS
       - run: echo $GRADLE_OPTS
       - run: cd android && fastlane android beta
 
-      # - gke-auth
-      # - run:
-      #     name: upload latest apk to gcs
-      #     command: |
-      #       cd ~/galoy-mobile/android/app/build
-      #       VERSION_CODE=$(jq .elements[0].apkData.versionCode ./intermediates/instant_app_manifest/release/output.json)
-      #       cd ./outputs/apk/release/
-      #       gsutil cp ./app-release.apk gs://bitcoin-beach-wallet/"$VERSION_CODE".apk
-      #       gsutil cp ./app-release.apk gs://bitcoin-beach-wallet/latest.apk
-
       - run: git config credential.helper 'cache --timeout=120'
       - run: git config --global user.name "circleci-bot"
       - run: git config --global user.email "bot@circleci.com"

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -132,7 +132,7 @@ android {
         applicationId "com.galoyapp"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 304
+        versionCode 305
         versionName "1.7.5"
         missingDimensionStrategy 'react-native-camera', 'general' // React native camera
 

diff --git a/ios/GaloyApp.xcodeproj/project.pbxproj b/ios/GaloyApp.xcodeproj/project.pbxproj
@@ -492,7 +492,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 303;
+				CURRENT_PROJECT_VERSION = 304;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = AYPCPV46WW;
 				ENABLE_BITCODE = YES;
@@ -525,7 +525,7 @@
 				CODE_SIGN_ENTITLEMENTS = GaloyApp/GaloyApp.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 303;
+				CURRENT_PROJECT_VERSION = 304;
 				DEVELOPMENT_TEAM = AYPCPV46WW;
 				ENABLE_BITCODE = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";

diff --git a/ios/GaloyApp/Info.plist b/ios/GaloyApp/Info.plist
@@ -74,7 +74,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>303</string>
+	<string>304</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>