fastlane 2.201.1 → 2.204.0

data/pilot/lib/pilot/build_manager.rb

@@ -18,6 +18,11 @@ module Pilot
 
       UI.user_error!("No ipa or pkg file given") if config[:ipa].nil? && config[:pkg].nil?
 
+      if config[:ipa] && config[:pkg]
+        UI.important("WARNING: Both `ipa` and `pkg` options are defined either explicitly or with default_value (build found in directory)")
+        UI.important("Uploading `ipa` is preferred by default. Set `app_platform` to `osx` to force uploading `pkg`")
+      end
+
       check_for_changelog_or_whats_new!(options)
 
       UI.success("Ready to upload new build to TestFlight (App: #{fetch_app_id})...")
@@ -25,24 +30,29 @@ module Pilot
       dir = Dir.mktmpdir
 
       platform = fetch_app_platform
-      if options[:ipa]
+      ipa_path = options[:ipa]
+      if ipa_path && platform != 'osx'
+        asset_path = ipa_path
         package_path = FastlaneCore::IpaUploadPackageBuilder.new.generate(app_id: fetch_app_id,
-                                                                      ipa_path: options[:ipa],
+                                                                      ipa_path: ipa_path,
                                                                   package_path: dir,
                                                                       platform: platform)
       else
+        pkg_path = options[:pkg]
+        asset_path = pkg_path
         package_path = FastlaneCore::PkgUploadPackageBuilder.new.generate(app_id: fetch_app_id,
-                                                                        pkg_path: options[:pkg],
+                                                                        pkg_path: pkg_path,
                                                                     package_path: dir,
                                                                         platform: platform)
       end
 
       transporter = transporter_for_selected_team(options)
-      result = transporter.upload(package_path: package_path, asset_path: options[:ipa] || options[:pkg])
+      result = transporter.upload(package_path: package_path, asset_path: asset_path)
 
       unless result
         transporter_errors = transporter.displayable_errors
-        UI.user_error!("Error uploading ipa file: \n #{transporter_errors}")
+        file_type = platform == "osx" ? "pkg" : "ipa"
+        UI.user_error!("Error uploading #{file_type} file: \n #{transporter_errors}")
       end
 
       UI.success("Successfully uploaded the new binary to App Store Connect")
@@ -98,7 +108,7 @@ module Pilot
 
     def wait_for_build_processing_to_be_complete(return_when_build_appears = false)
       platform = fetch_app_platform
-      if config[:ipa]
+      if config[:ipa] && platform != "osx"
         app_version = FastlaneCore::IpaFileAnalyser.fetch_app_version(config[:ipa])
         app_build = FastlaneCore::IpaFileAnalyser.fetch_app_build(config[:ipa])
       elsif config[:pkg]
@@ -410,7 +420,7 @@ module Pilot
       # This is where we could add a check to see if encryption is required and has been updated
       uploaded_build = set_export_compliance_if_needed(uploaded_build, options)
 
-      if options[:groups] || options[:distribute_external]
+      if options[:submit_beta_review] && (options[:groups] || options[:distribute_external])
         if uploaded_build.ready_for_beta_submission?
           uploaded_build.post_beta_app_review_submission
         else

data/pilot/lib/pilot/options.rb

@@ -324,7 +324,12 @@ module Pilot
                                      env_name: "PILOT_REJECT_PREVIOUS_BUILD",
                                      description: "Expire previous if it's 'waiting for review'",
                                      is_string: false,
-                                     default_value: false)
+                                     default_value: false),
+        FastlaneCore::ConfigItem.new(key: :submit_beta_review,
+                                     env_name: "PILOT_DISTRIBUTE_EXTERNAL",
+                                     description: "Send the build for a beta review",
+                                     type: Boolean,
+                                     default_value: true)
       ]
     end
   end

data/scan/lib/scan/options.rb

@@ -328,6 +328,11 @@ module Scan
                                      default_value: false),
 
         # concurrency
+        FastlaneCore::ConfigItem.new(key: :parallel_testing,
+                                     type: Boolean,
+                                     env_name: "SCAN_PARALLEL_TESTING",
+                                     description: "Optionally override the per-target setting in the scheme for running tests in parallel. Equivalent to -parallel-testing-enabled",
+                                     optional: true),
         FastlaneCore::ConfigItem.new(key: :concurrent_workers,
                                      type: Integer,
                                      env_name: "SCAN_CONCURRENT_WORKERS",
@@ -515,7 +520,7 @@ module Scan
                                     default_value: false),
         FastlaneCore::ConfigItem.new(key: :number_of_retries,
                                     env_name: 'SCAN_NUMBER_OF_RETRIES',
-                                    description: "The number of times a test can fail before scan should stop retrying",
+                                    description: "The number of times a test can fail",
                                     type: Integer,
                                     default_value: 0)
 

data/scan/lib/scan/runner.rb

@@ -20,7 +20,8 @@ module Scan
     end
 
     def run
-      handle_results(test_app)
+      @xcresults_before_run = find_xcresults_in_derived_data
+      return handle_results(test_app)
     end
 
     def test_app
@@ -106,7 +107,7 @@ module Scan
       tests = retryable_tests(error_output)
 
       if tests.empty?
-        UI.crash!("Failed to find failed tests to retry (could not parse error output)")
+        UI.build_failure!("Failed to find failed tests to retry (could not parse error output)")
       end
 
       Scan.config[:only_testing] = tests
@@ -172,21 +173,44 @@ module Scan
       return find_filename('json-compilation-database')
     end
 
+    def find_xcresults_in_derived_data
+      derived_data_path = Scan.config[:derived_data_path]
+      return [] if derived_data_path.nil? # Swift packages might not have derived data
+
+      xcresults_path = File.join(derived_data_path, "Logs", "Test", "*.xcresult")
+      return Dir[xcresults_path]
+    end
+
     def trainer_test_results
       require "trainer"
 
       results = {
         number_of_tests: 0,
         number_of_failures: 0,
-        number_of_retries: 0
+        number_of_retries: 0,
+        number_of_tests_excluding_retries: 0,
+        number_of_failures_excluding_retries: 0
       }
 
       result_bundle_path = Scan.cache[:result_bundle_path]
 
+      # Looks for xcresult file in derived data if not specifically set
+      if result_bundle_path.nil?
+        xcresults = find_xcresults_in_derived_data
+        new_xcresults = xcresults - @xcresults_before_run
+
+        if new_xcresults.size != 1
+          UI.build_failure!("Cannot find .xcresult in derived data which is needed to determine test results. This is an issue within scan. File an issue on GitHub or try setting option `result_bundle: true`")
+        end
+
+        result_bundle_path = new_xcresults.first
+        Scan.cache[:result_bundle_path] = result_bundle_path
+      end
+
       output_path = Scan.config[:output_directory] || Dir.mktmpdir
       output_path = File.absolute_path(output_path)
 
-      UI.crash!("A -resultBundlePath is needed to parse the test results. This should not have happened. Please file an issue.") unless result_bundle_path
+      UI.build_failure!("A -resultBundlePath is needed to parse the test results. This should not have happened. Please file an issue.") unless result_bundle_path
 
       params = {
         path: result_bundle_path,
@@ -222,8 +246,10 @@ module Scan
 
       resulting_paths = Trainer::TestParser.auto_convert(params)
       resulting_paths.each do |path, data|
-        results[:number_of_tests] += data[:number_of_tests_excluding_retries]
-        results[:number_of_failures] += data[:number_of_failures_excluding_retries]
+        results[:number_of_tests] += data[:number_of_tests]
+        results[:number_of_failures] += data[:number_of_failures]
+        results[:number_of_tests_excluding_retries] += data[:number_of_tests_excluding_retries]
+        results[:number_of_failures_excluding_retries] += data[:number_of_failures_excluding_retries]
         results[:number_of_retries] += data[:number_of_retries]
       end
 
@@ -231,13 +257,17 @@ module Scan
     end
 
     def handle_results(tests_exit_status)
-      return if Scan.config[:build_for_testing]
+      copy_simulator_logs
+      zip_build_products
+      copy_xctestrun
+
+      return nil if Scan.config[:build_for_testing]
 
       results = trainer_test_results
 
       number_of_retries = results[:number_of_retries]
-      number_of_tests = results[:number_of_tests]
-      number_of_failures = results[:number_of_failures]
+      number_of_tests = results[:number_of_tests_excluding_retries]
+      number_of_failures = results[:number_of_failures_excluding_retries]
 
       SlackPoster.new.run({
         tests: number_of_tests,
@@ -268,10 +298,6 @@ module Scan
       }))
       puts("")
 
-      copy_simulator_logs
-      zip_build_products
-      copy_xctestrun
-
       if number_of_failures > 0
         open_report
 
@@ -283,6 +309,7 @@ module Scan
       end
 
       open_report
+      return results
     end
 
     def open_report

data/scan/lib/scan/test_command_generator.rb

@@ -53,8 +53,9 @@ module Scan
       if config[:use_system_scm] && !options.include?("-scmProvider system")
         options << "-scmProvider system"
       end
-      options << "-resultBundlePath '#{result_bundle_path(config[:result_bundle])}'"
+      options << "-resultBundlePath '#{result_bundle_path(true)}'" if config[:result_bundle]
       if FastlaneCore::Helper.xcode_at_least?(10)
+        options << "-parallel-testing-enabled #{config[:parallel_testing] ? 'YES' : 'NO'}" unless config[:parallel_testing].nil?
         options << "-parallel-testing-worker-count #{config[:concurrent_workers]}" if config[:concurrent_workers]
         options << "-maximum-concurrent-test-simulator-destinations #{config[:max_concurrent_simulators]}" if config[:max_concurrent_simulators]
         options << "-disable-concurrent-testing" if config[:disable_concurrent_testing]
@@ -72,9 +73,13 @@ module Scan
       end
       options << "-xctestrun '#{config[:xctestrun]}'" if config[:xctestrun]
       options << config[:xcargs] if config[:xcargs]
-      if config[:number_of_retries] >= 1 && FastlaneCore::Helper.xcode_at_least?(13)
+
+      # Number of retries does not equal xcodebuild's -test-iterations number
+      # It needs include 1 iteration by default
+      number_of_retries = config[:number_of_retries] + 1
+      if number_of_retries > 1 && FastlaneCore::Helper.xcode_at_least?(13)
         options << "-retry-tests-on-failure"
-        options << "-test-iterations #{config[:number_of_retries]}"
+        options << "-test-iterations #{number_of_retries}"
       end
 
       # detect_values will ensure that these values are present as Arrays if

data/snapshot/lib/snapshot/simulator_launchers/simulator_launcher_base.rb

@@ -94,7 +94,11 @@ module Snapshot
         device_udid = TestCommandGenerator.device_udid(device_type)
 
         UI.message("Launch Simulator #{device_type}")
-        Helper.backticks("xcrun instruments -w #{device_udid} &> /dev/null")
+        if FastlaneCore::Helper.xcode_at_least?("13")
+          Helper.backticks("open -a Simulator.app --args -CurrentDeviceUDID #{device_udid} &> /dev/null")
+        else
+          Helper.backticks("xcrun instruments -w #{device_udid} &> /dev/null")
+        end
 
         paths.each do |path|
           UI.message("Adding '#{path}'")

data/spaceship/lib/spaceship/connect_api/models/app.rb

@@ -435,7 +435,8 @@ module Spaceship
         client ||= Spaceship::ConnectAPI
         filter = {
           state: [
-            Spaceship::ConnectAPI::ReviewSubmission::ReviewSubmissionState::WAITING_FOR_REVIEW
+            Spaceship::ConnectAPI::ReviewSubmission::ReviewSubmissionState::WAITING_FOR_REVIEW,
+            Spaceship::ConnectAPI::ReviewSubmission::ReviewSubmissionState::IN_REVIEW
           ].join(","),
           platform: platform
         }

metadata

@@ -1,39 +1,39 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.201.1
+  version: 2.204.0
 platform: ruby
 authors:
-- Jorge Revuelta H
-- Jérôme Lacoste
-- Andrew McBurney
-- Daniel Jankowski
-- Satoshi Namai
-- Helmut Januschka
-- Josh Holtz
-- Iulian Onofrei
 - Roger Oba
+- Iulian Onofrei
+- Kohki Miki
+- Maksym Grebenets
+- Luka Mirosevic
+- Josh Holtz
+- Max Ott
+- Aaron Brager
+- Danielle Tomlinson
+- Olivier Halligon
+- Andrew McBurney
+- Jan Piotrowski
 - Jimmy Dee
-- Łukasz Grabowski
 - Manu Wallner
-- Matthew Ellis
-- Manish Rathi
-- Jan Piotrowski
+- Jérôme Lacoste
+- Helmut Januschka
+- Łukasz Grabowski
+- Stefan Natchev
 - Fumiya Nakamura
-- Luka Mirosevic
-- Olivier Halligon
-- Joshua Liebowitz
 - Felix Krause
-- Aaron Brager
-- Kohki Miki
-- Stefan Natchev
-- Max Ott
-- Danielle Tomlinson
-- Maksym Grebenets
+- Jorge Revuelta H
+- Joshua Liebowitz
+- Satoshi Namai
+- Matthew Ellis
+- Manish Rathi
+- Daniel Jankowski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-23 00:00:00.000000000 Z
+date: 2022-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -1017,7 +1017,6 @@ files:
 - fastlane/lib/fastlane/action.rb
 - fastlane/lib/fastlane/action_collector.rb
 - fastlane/lib/fastlane/actions/.DS_Store
-- fastlane/lib/fastlane/actions/.run_tests.rb.swp
 - fastlane/lib/fastlane/actions/README.md
 - fastlane/lib/fastlane/actions/actions_helper.rb
 - fastlane/lib/fastlane/actions/adb.rb
@@ -1355,6 +1354,7 @@ files:
 - fastlane/swift/Actions.swift
 - fastlane/swift/Appfile.swift
 - fastlane/swift/ArgumentProcessor.swift
+- fastlane/swift/Atomic.swift
 - fastlane/swift/ControlCommand.swift
 - fastlane/swift/Deliverfile.swift
 - fastlane/swift/DeliverfileProtocol.swift
@@ -1578,8 +1578,6 @@ files:
 - scan/lib/assets/ScanfileTemplate
 - scan/lib/assets/ScanfileTemplate.swift
 - scan/lib/scan.rb
-- scan/lib/scan/.error_handler.rb.swp
-- scan/lib/scan/.runner.rb.swp
 - scan/lib/scan/commands_generator.rb
 - scan/lib/scan/detect_values.rb
 - scan/lib/scan/error_handler.rb
@@ -1850,7 +1848,6 @@ files:
 - trainer/lib/.DS_Store
 - trainer/lib/assets/junit.xml.erb
 - trainer/lib/trainer.rb
-- trainer/lib/trainer/.options.rb.swp
 - trainer/lib/trainer/commands_generator.rb
 - trainer/lib/trainer/junit_generator.rb
 - trainer/lib/trainer/module.rb