From 1c041072db34391021dc2763d35b022bc19f8c74 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Tue, 5 Oct 2021 15:09:46 -0300 Subject: [PATCH] Update fastlane --- fastlane/Fastfile | 31 ++++++---- fastlane/Gemfile | 1 + fastlane/Gemfile.lock | 53 +++++++++-------- fastlane/README.md | 57 +++++++++++++++++++ .../android/en-US/full_description.txt | 2 +- fastlane/metadata/changelog | 2 +- 6 files changed, 109 insertions(+), 37 deletions(-) create mode 100644 fastlane/README.md diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 109b0cefb..5cbe4b505 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -311,11 +311,13 @@ platform :ios do end end - desc 'Get iOS adhoc profiles' - lane :adhoc do - if ENV['MATCH_TYPE'] != 'adhoc' && !ENV['MATCH_PASSWORD'].nil? && !ENV['MATCH_PASSWORD'].empty? + desc 'Get iOS match profiles' + lane :match do + if !ENV['MATCH_PASSWORD'].nil? && !ENV['MATCH_PASSWORD'].empty? + api_key = get_apple_api_key() match( - type: 'adhoc' + api_key: api_key, + type: ENV['MATCH_TYPE'] || 'adhoc' ) end end @@ -847,12 +849,9 @@ def send_message_to_mattermost(options) end end -def submit_to_testflight(ipa_path) - ipa = (Dir.glob(ipa_path).select { |f| File.file? f}).first - - if !ipa.nil? - UI.success("ipa file #{ipa}") - unless ENV['IOS_API_KEY_ID'].nil? || ENV['IOS_API_KEY_ID'].empty? || +def get_apple_api_key + api_key = '' + unless ENV['IOS_API_KEY_ID'].nil? || ENV['IOS_API_KEY_ID'].empty? || ENV['IOS_API_ISSUER_ID'].nil? || ENV['IOS_API_ISSUER_ID'].empty? || ENV['IOS_API_KEY'].nil? || ENV['IOS_API_KEY'].empty? api_key_path = "#{ENV['IOS_API_KEY_ID']}.p8" @@ -873,6 +872,18 @@ def submit_to_testflight(ipa_path) ) File.delete("../#{api_key_path}") + end + + return api_key +end + +def submit_to_testflight(ipa_path) + ipa = (Dir.glob(ipa_path).select { |f| File.file? f}).first + + if !ipa.nil? + UI.success("ipa file #{ipa}") + api_key = get_apple_api_key() + unless api_key.empty? pilot( ipa: ipa, api_key: api_key diff --git a/fastlane/Gemfile b/fastlane/Gemfile index 1e864103e..473b20e33 100644 --- a/fastlane/Gemfile +++ b/fastlane/Gemfile @@ -2,6 +2,7 @@ source "https://rubygems.org" gem "fastlane" gem "nokogiri" +gem "slack-notifier", "2.3.2" plugins_path = File.join(File.dirname(__FILE__), '.', 'Pluginfile') eval(File.read(plugins_path), binding) if File.exist?(plugins_path) diff --git a/fastlane/Gemfile.lock b/fastlane/Gemfile.lock index fe835f6c3..5f28d038b 100644 --- a/fastlane/Gemfile.lock +++ b/fastlane/Gemfile.lock @@ -1,26 +1,27 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.3) + CFPropertyList (3.0.4) + rexml addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) artifactory (3.0.15) atomos (0.1.3) - aws-eventstream (1.1.1) - aws-partitions (1.492.0) - aws-sdk-core (3.119.1) + aws-eventstream (1.2.0) + aws-partitions (1.510.0) + aws-sdk-core (3.121.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.47.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-kms (1.49.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.100.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-s3 (1.103.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.4) + aws-sigv4 (~> 1.4) + aws-sigv4 (1.4.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) claide (1.0.3) @@ -34,9 +35,9 @@ GEM domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) dotenv (2.7.6) - emoji_regex (3.2.2) - excon (0.85.0) - faraday (1.7.1) + emoji_regex (3.2.3) + excon (0.86.0) + faraday (1.8.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -61,7 +62,7 @@ GEM faraday_middleware (1.1.0) faraday (~> 1.0) fastimage (2.2.5) - fastlane (2.192.0) + fastlane (2.195.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -106,7 +107,7 @@ GEM fastlane-plugin-find_replace_string (0.1.0) fastlane-plugin-versioning_android (0.1.0) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.10.0) + google-apis-androidpublisher_v3 (0.11.0) google-apis-core (>= 0.4, < 2.a) google-apis-core (0.4.1) addressable (~> 2.5, >= 2.5.1) @@ -121,14 +122,14 @@ GEM google-apis-core (>= 0.4, < 2.a) google-apis-playcustomapp_v1 (0.5.0) google-apis-core (>= 0.4, < 2.a) - google-apis-storage_v1 (0.6.0) + google-apis-storage_v1 (0.8.0) google-apis-core (>= 0.4, < 2.a) google-cloud-core (1.6.0) google-cloud-env (~> 1.0) google-cloud-errors (~> 1.0) google-cloud-env (1.5.0) faraday (>= 0.17.3, < 2.0) - google-cloud-errors (1.1.0) + google-cloud-errors (1.2.0) google-cloud-storage (1.34.1) addressable (~> 2.5) digest-crc (~> 0.4) @@ -137,20 +138,20 @@ GEM google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (0.17.0) + googleauth (1.0.0) faraday (>= 0.17.3, < 2.0) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) - signet (~> 0.14) + signet (>= 0.16, < 2.a) highline (2.0.3) http-cookie (1.0.4) domain_name (~> 0.5) httpclient (2.8.3) jmespath (1.4.0) json (2.5.1) - jwt (2.2.3) + jwt (2.3.0) memoist (0.16.2) mini_magick (4.11.0) mini_mime (1.1.1) @@ -159,7 +160,7 @@ GEM multipart-post (2.0.0) nanaimo (0.3.0) naturally (2.2.1) - nokogiri (1.12.4) + nokogiri (1.12.5) mini_portile2 (~> 2.6.1) racc (~> 1.4) optparse (0.1.1) @@ -178,14 +179,15 @@ GEM ruby2_keywords (0.0.5) rubyzip (2.3.2) security (0.1.3) - signet (0.15.0) - addressable (~> 2.3) + signet (0.16.0) + addressable (~> 2.8) faraday (>= 0.17.3, < 2.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) simctl (1.6.8) CFPropertyList naturally + slack-notifier (2.3.2) terminal-notifier (2.0.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) @@ -197,8 +199,8 @@ GEM uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.7) - unicode-display_width (1.7.0) + unf_ext (0.0.8) + unicode-display_width (1.8.0) webrick (1.7.0) word_wrap (1.0.0) xcodeproj (1.21.0) @@ -223,6 +225,7 @@ DEPENDENCIES fastlane-plugin-find_replace_string fastlane-plugin-versioning_android nokogiri + slack-notifier (= 2.3.2) BUNDLED WITH 2.1.4 diff --git a/fastlane/README.md b/fastlane/README.md new file mode 100644 index 000000000..56833d235 --- /dev/null +++ b/fastlane/README.md @@ -0,0 +1,57 @@ +fastlane documentation +================ +# Installation +``` +sudo gem install fastlane +``` +# Available Actions +## iOS +### ios dev +``` +fastlane ios dev +``` +Build Release file + +This will also make sure the profile is up to date +### ios beta +``` +fastlane ios beta +``` +Submit a new Beta Build to Apple TestFlight + +This will also make sure the profile is up to date +### ios release +``` +fastlane ios release +``` +Deploy a new version to the App Store +### ios build +``` +fastlane ios build +``` + + +---- + +## Android +### android dev +``` +fastlane android dev +``` + +### android beta +``` +fastlane android beta +``` + +### android release +``` +fastlane android release +``` + + +---- + +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 [https://fastlane.tools](https://fastlane.tools). +The documentation of fastlane can be found on [GitHub](https://github.com/fastlane/fastlane/tree/master/fastlane). diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt index 9d30f87ce..d35ad63d8 100644 --- a/fastlane/metadata/android/en-US/full_description.txt +++ b/fastlane/metadata/android/en-US/full_description.txt @@ -1,4 +1,4 @@ -Requires Mattermost Server v5.25+. Older servers may not be able to connect or have unexpected behavior. +Requires Mattermost Server v5.37+. Older servers may not be able to connect or have unexpected behavior. ------- diff --git a/fastlane/metadata/changelog b/fastlane/metadata/changelog index 7cc284736..1680d5f9c 100644 --- a/fastlane/metadata/changelog +++ b/fastlane/metadata/changelog @@ -1,4 +1,4 @@ -This version is compatible with Mattermost servers v5.25+. +This version is compatible with Mattermost servers v5.37.0+. Please see [changelog](https://docs.mattermost.com/administration/mobile-changelog.html) for full release notes. If you're interested in helping beta test upcoming versions before they are released, please see our [documentation](https://github.com/mattermost/mattermost-mobile#testing).