Revert "Let travis test archiving per commit too" (#16050)

* Revert "Roll engine to 6473f1b106485cb0b4ea569af383173daeef8895 (#16032)"

This reverts commit 844ced01.

* Revert "Let travis test archiving per commit too (#16004)"

This reverts commit df5905f3.

dev/bots/travis_script.sh

@@ -22,14 +22,9 @@ if [ "$SHARD" = "build_and_deploy_gallery" ]; then
     echo "Building Flutter Gallery for iOS..."
     (cd examples/flutter_gallery; flutter build ios --release --no-codesign)
     echo "iOS Flutter Gallery built"
-    if [[ "$TRAVIS_PULL_REQUEST" == "false" ]]; then
-      if [[ "$TRAVIS_BRANCH" == "dev" && $version != *"pre"* ]]; then
-        echo "Archiving with distribution profile and deploying to TestFlight..."
-        (cd examples/flutter_gallery/ios; bundle install && bundle exec fastlane build_and_deploy_testflight upload:true)
-      else
-        echo "Archiving with distribution profile..."
-        (cd examples/flutter_gallery/ios; bundle install && bundle exec fastlane build_and_deploy_testflight)
-      fi
+    if [[ "$TRAVIS_PULL_REQUEST" == "false" && "$TRAVIS_BRANCH" == "dev" && $version != *"pre"* ]]; then
+      echo "Re-building with distribution profile and deploying to TestFlight..."
+      (cd examples/flutter_gallery/ios; bundle install && bundle exec fastlane build_and_deploy_testflight)
     else
       echo "Flutter Gallery is only deployed to the TestFlight on merged and tagged dev branch commits"
     fi

examples/flutter_gallery/ios/fastlane/Fastfile

@@ -19,7 +19,7 @@ end
 # rebuild the app by:
 # 1- Signing using the publishing credentials; and
 # 2- xcodebuild with archive option
-platform :ios do |options|
+platform :ios do
   desc 'Push a new release to TestFlight'
   lane :build_and_deploy_testflight do
     # Doesn't do anything when not on Travis.
@@ -73,8 +73,6 @@ platform :ios do |options|
       codesigning_identity: 'iPhone Distribution: Store Ladd (S8QB4VV633)',
     )
 
-    if options[:upload]
-      upload_to_testflight
-    end
+    upload_to_testflight
   end
 end