Automated cherry pick of #3809 (#3810)

* Fix circleCI for unsigned builds * Bump app build number to 259 * Update fastlane Co-authored-by: Elias Nahum <[email protected]>
mattermost · Jan 14, 2020 · 373eb17 · 373eb17
1 parent d1778da
commit 373eb17
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 19 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -299,6 +299,7 @@ jobs:
     steps:
       - checkout:
           path: ~/mattermost-mobile
+      - ruby-setup
       - npm-dependencies
       - pods-dependencies
       - assets
@@ -308,8 +309,13 @@ jobs:
           working_directory: fastlane
           name: Run fastlane to build unsigned iOS
           no_output_timeout: 30m
-          command: bundle exec fastlane ios unsigned
-      - persist
+          command: |
+            HOMEBREW_NO_AUTO_UPDATE=1 brew install watchman
+            bundle exec fastlane ios unsigned
+      - persist_to_workspace:
+          root: ~/
+          paths:
+            - mattermost-mobile/Mattermost-unsigned.ipa
       - save:
           filename: "Mattermost-unsigned.ipa"
 
@@ -358,6 +364,7 @@ jobs:
       name: android
       resource_class: medium
     steps:
+      - ruby-setup
       - attach_workspace:
           at: ~/
       - run:
@@ -478,7 +485,7 @@ workflows:
             tags:
               only: /^v(\d+\.)(\d+\.)(\d+)(.*)?$/
             branches:
-              ignore: /.*/
+              only: unsigned
       - build-ios-unsigned:
           context: mattermost-mobile-unsigned
           requires:
@@ -487,7 +494,7 @@ workflows:
             tags:
               only: /^v(\d+\.)(\d+\.)(\d+)(.*)?$/
             branches:
-              ignore: /.*/
+              only: unsigned
       - github-release:
           context: mattermost-mobile-unsigned
           requires:
@@ -497,4 +504,4 @@ workflows:
             tags:
               only: /^v(\d+\.)(\d+\.)(\d+)(.*)?$/
             branches:
-              ignore: /.*/
+              only: unsigned
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -140,7 +140,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         missingDimensionStrategy "RNN.reactNativeVersion", "reactNative60"
-        versionCode 258
+        versionCode 259
         versionName "1.27.0"
         multiDexEnabled = true
         ndk {

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -278,8 +278,8 @@ lane :github do
   tag = ENV['CIRCLE_TAG'] || ENV['TAG']
 
   if tag
-    version = get_version_number(xcodeproj: './ios/Mattermost.xcodeproj', target: 'Mattermost')
-    build = get_build_number(xcodeproj: './ios/Mattermost.xcodeproj')
+    version = android_get_version_name(gradle_file: './android/app/build.gradle')
+    build = android_get_version_code(gradle_file: './android/app/build.gradle')
     changelog = File.read("metadata/changelog")
     changelog.concat("* Android [Mattermost.apk](https://releases.mattermost.com/mattermost-mobile/#{version}/#{build}/Mattermost.apk)\n")
     changelog.concat("* iOS [Mattermost.ipa](https://releases.mattermost.com/mattermost-mobile/#{version}/#{build}/Mattermost.ipa)")

diff --git a/fastlane/Gemfile.lock b/fastlane/Gemfile.lock
@@ -6,8 +6,8 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     atomos (0.1.3)
     aws-eventstream (1.0.3)
-    aws-partitions (1.261.0)
-    aws-sdk-core (3.86.0)
+    aws-partitions (1.263.0)
+    aws-sdk-core (3.89.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
@@ -43,7 +43,7 @@ GEM
     faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.1.7)
-    fastlane (2.139.0)
+    fastlane (2.140.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
@@ -94,11 +94,13 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
       signet (~> 0.12)
-    google-cloud-core (1.4.1)
+    google-cloud-core (1.5.0)
       google-cloud-env (~> 1.0)
+      google-cloud-errors (~> 1.0)
     google-cloud-env (1.3.0)
       faraday (~> 0.11)
-    google-cloud-storage (1.25.0)
+    google-cloud-errors (1.0.0)
+    google-cloud-storage (1.25.1)
       addressable (~> 2.5)
       digest-crc (~> 0.4)
       google-api-client (~> 0.33)

diff --git a/ios/Mattermost.xcodeproj/project.pbxproj b/ios/Mattermost.xcodeproj/project.pbxproj
@@ -1112,7 +1112,7 @@
 				CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 258;
+				CURRENT_PROJECT_VERSION = 259;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = UQ8HT4Q2XM;
 				ENABLE_BITCODE = NO;
@@ -1150,7 +1150,7 @@
 				CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 258;
+				CURRENT_PROJECT_VERSION = 259;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = UQ8HT4Q2XM;
 				ENABLE_BITCODE = NO;

diff --git a/ios/Mattermost/Info.plist b/ios/Mattermost/Info.plist
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>258</string>
+	<string>259</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/ios/MattermostShare/Info.plist b/ios/MattermostShare/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.27.0</string>
 	<key>CFBundleVersion</key>
-	<string>258</string>
+	<string>259</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

diff --git a/ios/MattermostTests/Info.plist b/ios/MattermostTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>258</string>
+	<string>259</string>
 </dict>
 </plist>
diff --git a/ios/NotificationService/Info.plist b/ios/NotificationService/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.27.0</string>
 	<key>CFBundleVersion</key>
-	<string>258</string>
+	<string>259</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>