Bgerstle has uploaded a new change for review. https://gerrit.wikimedia.org/r/210760
Change subject: deploy adhoc to HA for store lane ...................................................................... deploy adhoc to HA for store lane modify store lane so that it: - deploys the app to app store & hockeyapp - resigns the IPA using ad-hoc cert - deploys ad hoc IPA to hockeyapp while I was at it... - removed Gemfile spec for deliver - removed stdlog output from changelog generation - removed "skip_deploy" option (should fix missing release notes in TF betas) Bug: T98512 Change-Id: I5895e812ed0d79ca257d8b866eff8c40c251dbcc --- M Gemfile M Gemfile.lock M fastlane/Fastfile M fastlane/lib/utils.rb 4 files changed, 49 insertions(+), 28 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/60/210760/1 diff --git a/Gemfile b/Gemfile index 99c896f..23be19d 100644 --- a/Gemfile +++ b/Gemfile @@ -2,5 +2,4 @@ gem 'cocoapods', '~> 0.36.1' gem 'fastlane', '~> 1.0.2' -gem 'deliver', :git => 'https://github.com/krausefx/deliver.git', :ref => '90b89eb04aba987b286c1ed701be72a93fbfa276' gem 'git', '~> 1.2' diff --git a/Gemfile.lock b/Gemfile.lock index 9ca2985..b88636f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,3 @@ -GIT - remote: https://github.com/krausefx/deliver.git - revision: 90b89eb04aba987b286c1ed701be72a93fbfa276 - ref: 90b89eb04aba987b286c1ed701be72a93fbfa276 - specs: - deliver (0.10.0) - credentials_manager (>= 0.3.0) - excon - fastimage (~> 1.6.3) - fastlane_core (>= 0.7.2) - nokogiri (~> 1.6.5) - plist (~> 3.1.0) - rubyzip (~> 1.1.6) - GEM remote: https://rubygems.org/ specs: @@ -80,6 +66,15 @@ security (~> 0.1.2) term-ansicolor (~> 1.0.7) terminal-table (~> 1.4.5) + deliver (0.9.4) + credentials_manager (>= 0.3.0) + excon + fastimage (~> 1.6.3) + fastlane_core (>= 0.5.2) + nokogiri (~> 1.6.5) + plist (~> 3.1.0) + prawn + rubyzip (~> 1.1.6) domain_name (0.5.24) unf (>= 0.0.5, < 1.0.0) dotenv (2.0.1) @@ -170,6 +165,7 @@ mini_portile (~> 0.6.0) ntlm-http (0.1.1) open4 (1.3.4) + pdf-core (0.5.1) pem (0.5.5) fastlane_core (>= 0.6.0) phantomjs (1.9.8.0) @@ -179,6 +175,9 @@ cliver (~> 0.3.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) + prawn (2.0.1) + pdf-core (~> 0.5.1) + ttfunk (~> 1.4.0) produce (0.2.1) fastlane_core (>= 0.5.0) rack (1.6.1) @@ -197,6 +196,7 @@ terminal-notifier (1.6.3) terminal-table (1.4.5) thread_safe (0.3.5) + ttfunk (1.4.0) tzinfo (1.2.2) thread_safe (~> 0.1) unf (0.1.4) @@ -218,6 +218,5 @@ DEPENDENCIES cocoapods (~> 0.36.1) - deliver! fastlane (~> 1.0.2) git (~> 1.2) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 6658405..a9c432a 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -65,7 +65,7 @@ notify: '0', # Means do not notify status: '1', # Means do not make available for download ) - deliver skip_deploy: true, beta: true + deliver beta: true # uncomment when CI is able to push tags if ENV['WMF_BUMP'] @@ -87,30 +87,53 @@ notify: '0', # Means do not notify status: '1', # Means do not make available for download ) - deliver skip_deploy: true, beta: true + deliver beta: true end - desc "Deploy a new version to the App Store" + desc "Upload AppStore build to iTC & HockeyApp, plus a resigned AdHoc build to Hockey." lane :store do - # snapshot - sigh + # create app store build + sigh( + adhoc: false, + force: true, + filename: 'build/release.mobileprovision' + ) ipa( configuration: "Wikipedia", scheme: "Wikipedia", ) hockey( - notes: '', - notify: '0', # Means do not notify - status: '1', # Means do not make available for download + notes: git_commit_log, + notify: '0', # Do not notify + status: '1', # Do not make available for download + release_type: '1' # 'store' release type ) - deliver skip_deploy: true, force: true + deliver( + force: true + ) + # resign and deliver adhoc to HA + sigh( + adhoc: true, + force: true, + filename: 'build/adhoc.mobileprovision' + ) + resign( + signing_identity: 'iPhone Distribution: Wikimedia Foundation (AKK7J2GV64)', + provisioning_profile: 'build/adhoc.mobileprovision' + ) + hockey( + notes: git_commit_log, + notify: '0', # Means do not notify + status: '2', # Means make available for download + release_type: '0' # 'beta' release type + ) end after_all do |lane| - + end error do |lane, exception| - + end end diff --git a/fastlane/lib/utils.rb b/fastlane/lib/utils.rb index 82de744..ee5c409 100644 --- a/fastlane/lib/utils.rb +++ b/fastlane/lib/utils.rb @@ -25,7 +25,7 @@ # Generate a list of commit subjects from `rev` to `HEAD` # :rev: The git SHA to start the log from, defaults to `ENV[LAST_SUCCESS_REV']` def generate_git_commit_log(rev=ENV['GIT_PREVIOUS_SUCCESSFUL_COMMIT'] || 'HEAD^^^^^') - g = Git.open(ENV['PWD'], :log => Logger.new(STDOUT)) + g = Git.open ENV['PWD'] begin change_log = g.log.between(rev).map { |c| "- " + c.message.lines.first.chomp }.join "\n" "Commit Log:\n\n#{change_log}\n" -- To view, visit https://gerrit.wikimedia.org/r/210760 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5895e812ed0d79ca257d8b866eff8c40c251dbcc Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Bgerstle <bgers...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
