Merge pull request #211 from felixmeziere/add-production-deployments

feat(fastlane-env): Add production deployments
bamlab · Apr 17, 2019 · 1ed556c · 1ed556c
2 parents 38bc600 + 956ce77
commit 1ed556c
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 9 deletions.
diff --git a/generators/fastlane-env/index.js b/generators/fastlane-env/index.js
@@ -183,6 +183,20 @@ class FastlaneEnvGenerator extends Base {
         message: 'A valid App Center Username',
         when: answers => answers.deploymentPlatform === 'appcenter',
       },
+      {
+        type: 'input',
+        name: 'appstoreConnectAppleId',
+        message:
+          'An AppstoreConnect Apple Id (make sure the ID has "developer" acces - only allowed to upload builds). Can be entered later in fastlane/env.<environment>',
+        when: answers => answers.appstore,
+      },
+      {
+        type: 'input',
+        name: 'androidPlayStoreJsonKeyPath',
+        message:
+          'A Google Play JSON Key relative path. Can be entered later in fastlane/env.<environment>',
+        when: answers => answers.appstore,
+      },
       {
         type: 'confirm',
         name: 'useCodePush',

diff --git a/generators/fastlane-env/templates/fastlane/env b/generators/fastlane-env/templates/fastlane/env
@@ -13,6 +13,7 @@ IOS_TEAM_ID='<%= appleTeamId %>'
 IOS_USER_ID='<%= appleId %>'
 IOS_PLIST_PATH='<%= projectName %>/Info.plist'
 <% if (deploymentPlatform === 'appstore') { %>IOS_ITC_TEAM_NAME='<%= itunesTeamName %>'<% } %>
+<% if (appstore) { %>IOS_APPSTORECONNECT_USER_ID='<%= appstoreConnectAppleId %>'<% } %>
 
 ### IOS MATCH ###
 MATCH_GIT_URL='<%= matchGit %>'
@@ -37,6 +38,7 @@ GRADLE_APP_NAME='<%= appName %>'
 <% if (deploymentPlatform === 'appcenter') { %>ANDROID_APPCENTER_APP_ID='<%= androidAppCenterId %>'<% } %>
 GRADLE_KEYSTORE='<%= lowerCaseProjectName %>.<%= environmentName %>.keystore'
 GRADLE_KEYSTORE_ALIAS='<%= lowerCaseProjectName %>'
+<% if (appstore) { %>ANDROID_PLAYSTORE_JSON_KEY_PATH='<%= androidPlayStoreJsonKeyPath %>'<% } %>
 
 ### CODEPUSH ###
 <% if (useCodePush) { %>IOS_CODEPUSH_DEPLOYMENT_NAME='<%= iosCodePushDeploymentName %>'<% } %>

diff --git a/generators/fastlane-setup/templates/fastlane/Fastfile b/generators/fastlane-setup/templates/fastlane/Fastfile
@@ -136,7 +136,7 @@ platform :ios do
     )
   end
 
-  lane :deploy_appCenter do |options|
+  lane :upload_to_appcenter do |options|
     appcenter_upload(
       api_token: ENV['FL_APPCENTER_API_TOKEN'],
       owner_name: ENV['APPCENTER_USERNAME'],
@@ -146,6 +146,16 @@ platform :ios do
     )
   end
 
+  lane :upload_to_testflight do |options|
+    pilot(
+      username: ENV['IOS_APPSTORECONNECT_USER_ID'],
+      app_identifier: ENV['IOS_APP_ID'],
+      ipa: ENV['IOS_IPA_PATH'],
+      distribute_external: false,
+      skip_waiting_for_build_processing: true
+    )
+  end
+
   lane :deploy do |options|
     set_js_env
     if options[:codepush] then
@@ -161,12 +171,9 @@ platform :ios do
       if ENV['DEPLOYMENT_PLATFORM'] === 'hockeyapp' then
         deploy_hockey
       elsif ENV['DEPLOYMENT_PLATFORM'] === 'appcenter' then
-        deploy_appCenter
-      else
-        pilot(
-          distribute_external: false,
-          skip_waiting_for_build_processing: true
-        )
+        upload_to_appcenter
+      elsif ENV['DEPLOYMENT_PLATFORM'] === 'appstore'
+        upload_to_testflight
       end
     end
   end
@@ -247,7 +254,7 @@ platform :android do
     )
   end
 
-  lane :deploy_appCenter do |options|
+  lane :upload_to_appcenter do |options|
     appcenter_upload(
       api_token: ENV['FL_APPCENTER_API_TOKEN'],
       owner_name: ENV['APPCENTER_USERNAME'],
@@ -257,6 +264,15 @@ platform :android do
     )
   end
 
+  lane :upload_to_playstore do |options|
+    supply(
+      package_name: ENV['GRADLE_APP_IDENTIFIER'],
+      track: 'internal',
+      apk: ENV['ANDROID_APK_PATH'],
+      json_key: ENV['ANDROID_PLAYSTORE_JSON_KEY_PATH'],
+    )
+  end
+
   lane :deploy do |options|
     set_js_env
     if options[:codepush] then
@@ -267,7 +283,9 @@ platform :android do
       if ENV['DEPLOYMENT_PLATFORM'] === 'hockeyapp' then
         deploy_hockey
       elsif ENV['DEPLOYMENT_PLATFORM'] === 'appcenter' then
-        deploy_appCenter
+        upload_to_appcenter
+      elsif ENV['DEPLOYMENT_PLATFORM'] === 'appstore' then
+        upload_to_playstore
       end
     end
   end
@@ -276,4 +294,5 @@ platform :android do
     check_git_status(name: ENV['REPO_GIT_BRANCH'])
     deploy
   end
+
 end