Add PR Scheme for iOs build

Build PR Scheme in PR build use named parameters, use pr_build boolean Signed-off-by: Jakub Sokołowski <jakub@status.im> Enable capabilities Signed-off-by: Jakub Sokołowski <jakub@status.im> Add custom app icon Remove user defined profile Add PR scheme Explicit provide provisioning profiles Fix pr schema Bump jenkins Pod bump Describe pr_build argument Signed-off-by: Gheorghe Pinzaru <feross95@gmail.com>
status-im · Jun 29, 2020 · d916751 · d916751
1 parent c943f5f
commit d916751
Show file tree

Hide file tree

Showing 29 changed files with 719 additions and 46 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,7 +25,6 @@ DerivedData
 *.ipa
 *.xcuserstate
 project.xcworkspace
-xcshareddata
 
 # Android/IJ
 #

diff --git a/ci/Jenkinsfile.android b/ci/Jenkinsfile.android
@@ -1,4 +1,4 @@
-library 'status-react-jenkins@v1.1.7'
+library 'status-react-jenkins@v1.1.8'
 
 pipeline {
   agent { label 'linux' }

diff --git a/ci/Jenkinsfile.combined b/ci/Jenkinsfile.combined
@@ -1,4 +1,4 @@
-library 'status-react-jenkins@v1.1.7'
+library 'status-react-jenkins@v1.1.8'
 
 pipeline {
   agent { label 'linux' }

diff --git a/ci/Jenkinsfile.ios b/ci/Jenkinsfile.ios
@@ -1,4 +1,4 @@
-library 'status-react-jenkins@v1.1.7'
+library 'status-react-jenkins@v1.1.8'
 
 pipeline {
   agent { label 'macos-xcode-11.5' }

diff --git a/ci/Jenkinsfile.linux b/ci/Jenkinsfile.linux
@@ -1,4 +1,4 @@
-library 'status-react-jenkins@v1.1.7'
+library 'status-react-jenkins@v1.1.8'
 
 pipeline {
   agent { label 'linux' }

diff --git a/ci/Jenkinsfile.macos b/ci/Jenkinsfile.macos
@@ -1,4 +1,4 @@
-library 'status-react-jenkins@v1.1.7'
+library 'status-react-jenkins@v1.1.8'
 
 pipeline {
   agent { label 'macos-xcode-11.5' }

diff --git a/ci/Jenkinsfile.nix-cache b/ci/Jenkinsfile.nix-cache
@@ -1,4 +1,4 @@
-library 'status-react-jenkins@v1.1.7'
+library 'status-react-jenkins@v1.1.8'
 
 pipeline {
   agent { label params.AGENT_LABEL }

diff --git a/ci/Jenkinsfile.windows b/ci/Jenkinsfile.windows
@@ -1,4 +1,4 @@
-library 'status-react-jenkins@v1.1.7'
+library 'status-react-jenkins@v1.1.8'
 
 pipeline {
   agent { label 'linux' }

diff --git a/ci/tools/Jenkinsfile.fastlane-clean b/ci/tools/Jenkinsfile.fastlane-clean
@@ -1,4 +1,4 @@
-library 'status-react-jenkins@v1.1.7'
+library 'status-react-jenkins@v1.1.8'
 
 pipeline {
   agent { label 'macos' }

diff --git a/ci/tools/Jenkinsfile.playstore-meta b/ci/tools/Jenkinsfile.playstore-meta
@@ -1,4 +1,4 @@
-library 'status-react-jenkins@v1.1.7'
+library 'status-react-jenkins@v1.1.8'
 
 pipeline {
   agent { label 'linux' }

diff --git a/fastlane/Appfile b/fastlane/Appfile
@@ -4,6 +4,12 @@ app_identifier('im.status.ethereum') # The bundle identifier of your app
 apple_id(ENV['FASTLANE_APPLE_ID']) # Your Apple email address
 itc_team_id('118430139') # iTunes Connect Team ID
 
+for_platform :ios do
+  for_lane :pr do
+    app_identifier('im.status.ethereum.pr')
+  end
+end
+
 # Android
 
 # json_key_file('') # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -86,21 +86,38 @@ end
 # `readonly`:
 #    if true  - only fetch existing certificates and profiles, don't upgrade from AppStoreConnect
 #    if false - read list of devices from AppStoreConnect, and upgrade the provisioning profiles from it
-def build_ios_adhoc(readonly)
+# `pr_build`:
+#    if true  - uses StatusImPR scheme and postfixed app id with `.pr` to build an app, which can be used in parallel with release
+#    if false - uses StatusIm scheme to build the release app 
+
+def build_ios_adhoc(readonly: false, pr_build: false)
+  # PR builds should appear as a separate App on iOS
+  scheme = pr_build ? 'StatusImPR' : 'StatusIm'
+  app_id = pr_build ? 'im.status.ethereum.pr' : 'im.status.ethereum'
+
   match(
     type: 'adhoc',
     force_for_new_devices: true,
     readonly: readonly,
+    app_identifier: app_id,
     keychain_name: 'login.keychain'
   )
 
   build_ios_app(
-    scheme: 'StatusIm',
+    scheme: scheme,
     workspace: 'ios/StatusIm.xcworkspace',
     configuration: 'Release',
     clean: true,
     export_method: 'ad-hoc',
-    output_directory: 'status-adhoc'
+    output_name: 'StatusIm',
+    output_directory: 'status-adhoc',
+    export_options: {
+      signingStyle: 'manual',
+      provisioningProfiles: {
+        "im.status.ethereum": "match AdHoc im.status.ethereum",
+        "im.status.ethereum.pr": "match AdHoc im.status.ethereum.pr"
+      }
+    }
   )
 end
 
@@ -165,7 +182,7 @@ platform :ios do
   desc 'This .ipa is ready to be distibuted through diawi.com'
   lane :adhoc do
     unlock_keychain_if_needed
-    build_ios_adhoc(true)
+    build_ios_adhoc(readonly: true)
   end
 
   desc '`fastlane ios e2e` - e2e lane for iOS.'
@@ -180,21 +197,22 @@ platform :ios do
   desc 'This lane builds a new adhoc build and leaves an .ipa that is ad-hoc signed (can be uploaded to diawi)'
   lane :pr do
     unlock_keychain_if_needed
-    build_ios_adhoc(false)
+    build_ios_adhoc(pr_build: true)
   end
 
   desc '`fastlane ios nightly` - makes a new nightly'
   desc 'This lane builds a new nightly and leaves an .ipa that is ad-hoc signed (can be uploaded to diawi)'
   lane :nightly do
     unlock_keychain_if_needed
-    build_ios_adhoc(false)
+    build_ios_adhoc()
   end
 
   desc '`fastlane ios release` builds a release & uploads it to TestFlight'
   lane :release do
     match(
       type: 'appstore',
       readonly: true,
+      app_identifier: 'im.status.ethereum',
       keychain_name: 'login.keychain'
     )
 

diff --git a/fastlane/Matchfile b/fastlane/Matchfile
@@ -2,7 +2,7 @@ git_url('git@github.com:status-im/ios-certificates.git')
 
 type('development') # The default type, can be: appstore, adhoc, enterprise or development
 
-# app_identifier(['tools.fastlane.app', 'tools.fastlane.app2'])
+app_identifier(['im.status.ethereum', 'im.status.ethereum.pr'])
 username(ENV['FASTLANE_APPLE_ID']) # Your Apple Developer Portal username
 
 # For all available options run `fastlane match --help`

diff --git a/ios/Podfile b/ios/Podfile
@@ -44,7 +44,7 @@ def flipper_post_install(installer)
   end
 end
 
-target 'StatusIm' do
+abstract_target 'Status' do
   # Pods for StatusQuo
   pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector"
   pod 'FBReactNativeSpec', :path => "../node_modules/react-native/Libraries/FBReactNativeSpec"
@@ -81,14 +81,21 @@ target 'StatusIm' do
   pod 'SQLCipher', '~>3.0'
   pod 'SSZipArchive'
 
+  target 'StatusIm' do
+    target 'StatusImTests' do
+      inherit! :complete
+      # Pods for testing
+    end
+  end
+
+  target 'StatusImPR' do
+  end
+
   add_flipper_pods!
   post_install do |installer|
     flipper_post_install(installer)
   end
-  target 'StatusImTests' do
-    inherit! :complete
-    # Pods for testing
-  end
+
 
   use_native_modules!
 end
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -257,7 +257,7 @@ PODS:
     - React
   - react-native-splash-screen (3.2.0):
     - React
-  - react-native-webview (9.4.0):
+  - react-native-webview (10.3.1):
     - React
   - React-RCTActionSheet (0.62.2):
     - React-Core/RCTActionSheetHeaders (= 0.62.2)
@@ -588,7 +588,7 @@ SPEC CHECKSUMS:
   react-native-safe-area-context: 60f654e00b6cc416573f6d5dbfce3839958eb57a
   react-native-shake: de052eaa3eadc4a326b8ddd7ac80c06e8d84528c
   react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
-  react-native-webview: cf5527893252b3b036eea024a1da6996f7344c74
+  react-native-webview: 40bbeb6d011226f34cb83f845aeb0fdf515cfc5f
   React-RCTActionSheet: f41ea8a811aac770e0cc6e0ad6b270c644ea8b7c
   React-RCTAnimation: 49ab98b1c1ff4445148b72a3d61554138565bad0
   React-RCTBlob: a332773f0ebc413a0ce85942a55b064471587a71
@@ -618,6 +618,6 @@ SPEC CHECKSUMS:
   Yoga: 3ebccbdd559724312790e7742142d062476b698e
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
-PODFILE CHECKSUM: 23557eb8cb46b1c5dd060326fe1873a162394149
+PODFILE CHECKSUM: f66349c5bfb9c21ac968307ea5a2d6c2dd4091ed
 
-COCOAPODS: 1.9.1
+COCOAPODS: 1.9.3