ci: bump ios version, added huawei to plugin file (#423)

GaloyMoney · Mar 30, 2022 · 2ccb5db · 2ccb5db
1 parent ca64852
commit 2ccb5db
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 32 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -150,10 +150,10 @@ jobs:
       - run: git config --global user.name "circleci-bot"
       - run: git config --global user.email "bot@circleci.com"
       - run: git config pull.rebase false
-      - run: git pull https://${GITHUB_TOKEN}@github.com/GaloyMoney/galoy-mobile.git $CIRCLE_BRANCH
+      - run: git pull https://${GITHUB_TOKEN}@github.com/GaloyMoney/galoy-mobile.git main
       - run: git commit -a -m "new ios build [ci skip]"
       - run: git reset -- GoogleService-Info.plist
-      - run: git push -q https://${GITHUB_TOKEN}@github.com/GaloyMoney/galoy-mobile.git $CIRCLE_BRANCH
+      - run: git push -q https://${GITHUB_TOKEN}@github.com/GaloyMoney/galoy-mobile.git main
       - store_artifacts:
           path: ios/output
       - store_test_results:
@@ -224,11 +224,11 @@ jobs:
       - run: git config --global user.name "circleci-bot"
       - run: git config --global user.email "bot@circleci.com"
       - run: git config pull.rebase false
-      - run: git pull origin $CIRCLE_BRANCH
+      - run: git pull origin main
       - run: cd ~/galoy-mobile
       - run: git add --force android/app/build/generated/sourcemaps/react/release
       - run: git commit -a -m "new android build [ci skip]"
-      - run: git push -q https://${GITHUB_TOKEN}@github.com/GaloyMoney/galoy-mobile.git $CIRCLE_BRANCH
+      - run: git push -q https://${GITHUB_TOKEN}@github.com/GaloyMoney/galoy-mobile.git main
 
   update_locale:
     working_directory: ~/galoy-mobile
@@ -250,7 +250,7 @@ jobs:
       - run: |
           if [[ $(-- . ':!.phrase.yml') ]]; then
             git commit -a -m "update translation file [ci skip]" -- . ':!.phrase.yml'
-            git push -q https://${GITHUB_TOKEN}@github.com/GaloyMoney/galoy-mobile.git $CIRCLE_BRANCH
+            git push -q https://${GITHUB_TOKEN}@github.com/GaloyMoney/galoy-mobile.git main
           else
             echo "nothing to commit"
           fi

diff --git a/android/fastlane/Pluginfile b/android/fastlane/Pluginfile
@@ -3,3 +3,4 @@
 # Ensure this file is checked in to source control!
 
 gem 'fastlane-plugin-increment_version_code'
+gem 'fastlane-plugin-huawei_appgallery_connect'
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 = 302;
+				CURRENT_PROJECT_VERSION = 303;
 				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 = 302;
+				CURRENT_PROJECT_VERSION = 303;
 				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>302</string>
+	<string>303</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

diff --git a/ios/fastlane/README.md b/ios/fastlane/README.md
@@ -1,48 +1,39 @@
 fastlane documentation
-----
-
+================
 # Installation
 
 Make sure you have the latest version of the Xcode command line tools installed:
 
-```sh
+```
 xcode-select --install
 ```
 
-For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane)
+Install _fastlane_ using
+```
+[sudo] gem install fastlane -NV
+```
+or alternatively using `brew install fastlane`
 
 # Available Actions
-
 ## iOS
-
 ### ios beta
-
-```sh
-[bundle exec] fastlane ios beta
 ```
-
+fastlane ios beta
+```
 Push a new beta build to TestFlight
-
 ### ios increment
-
-```sh
-[bundle exec] fastlane ios increment
 ```
-
+fastlane ios increment
+```
 increment path version
-
 ### ios build_ipa
-
-```sh
-[bundle exec] fastlane ios build_ipa
 ```
-
+fastlane ios build_ipa
+```
 build ipa
 
 ----
 
 This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
-
-More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools).
-
-The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools).
+More information about fastlane can be found on [fastlane.tools](https://fastlane.tools).
+The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools).