From d4882c02522f806193a172009e74643717774ca8 Mon Sep 17 00:00:00 2001
From: ZachOrr <ZachOrr@users.noreply.github.com>
Date: Sun, 19 May 2019 15:22:32 -0400
Subject: [PATCH] [app_store] [clowntown] v1.1.2

---
 .travis.yml          |  6 ++++++
 fastlane/Deliverfile |  2 +-
 fastlane/Fastfile    | 13 +++++++++----
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 47dac2c1b..1915411be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,8 @@ stages:
   if: (type == cron)
 - name: test
   if: NOT ((type == push AND commit_message =~ \[clowntown\]) OR (type == cron))
+- name: app_store
+  if: (type == push) AND (branch == master) AND (commit_message =~ \[app_store\])
 - name: beta
   if: (type == push) AND (branch == master) AND (commit_message =~ \[beta\])
 
@@ -50,6 +52,10 @@ jobs:
     script:
     - bundle exec fastlane setup_secrets
     - bundle exec fastlane beta_ci
+  - stage: app_store
+    script:
+    - bundle exec fastlane setup_secrets
+    - bundle exec fastlane app_store
 
 after_failure:
 - gem install second_curtain
diff --git a/fastlane/Deliverfile b/fastlane/Deliverfile
index 78ef3bc81..51000d433 100644
--- a/fastlane/Deliverfile
+++ b/fastlane/Deliverfile
@@ -2,6 +2,6 @@
 # For more information, check out the docs
 # https://docs.fastlane.tools/actions/deliver/
 
-build_number(99)
+force(true)
 submit_for_review(true)
 automatic_release(true)
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 9e46cec29..76c79fda4 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -65,7 +65,6 @@ platform :ios do
 
     slack(channel: "#github-ios", message: "Shipping #{current_git_tag} to TestFlight...", default_payloads: [])
     pilot(changelog: commit_changelog, distribute_external: true, groups: ["Beta"], reject_build_waiting_for_review: true)
-
     slack(
       channel: "#github-ios",
       message: "#{current_git_tag} uploaded to TestFlight 🎉",
@@ -75,12 +74,12 @@ platform :ios do
 
   desc "Upload a new build to the App Store"
   lane :app_store do
-    setup_secrets
-
+    preship
     build
+
     deliver
     ship_github(is_prerelease: false) # Create GitHub release
-    slack(channel: "#app-releases", message: "Shipping iOS #{current_version} to the App Store 🎉\nhttps://github.com/the-blue-alliance/the-blue-alliance-ios/releases/tag/#{current_version}")
+    slack(channel: "#app-releases", message: "Shipping iOS #{current_version} to the App Store 🎉\n```\n#{commit_changelog}\n```\nhttps://github.com/the-blue-alliance/the-blue-alliance-ios/releases/tag/#{current_version}")
 
     new_version(version_type: 'patch')
     beta_ci
@@ -109,6 +108,12 @@ platform :ios do
     increment_build_number(build_number: testflight_build_number + 1)
   end
 
+  desc "Perform pre-App Store tasks"
+  private_lane :preship do
+    # Set our build number to 99 for the App Store
+    increment_build_number(build_number: 99)
+  end
+
   desc "Perform codesign/build tasks"
   private_lane :build do
     configure_code_signing