Split ASC build from upload in CI

.buildkite/commands/release-build.sh

@@ -9,9 +9,5 @@ install_cocoapods
 echo "--- :closed_lock_with_key: Installing Secrets"
 bundle exec fastlane run configure_apply
 
-echo "--- :hammer_and_wrench: Build and Upload to App Store Connect"
-bundle exec fastlane build_and_upload_to_app_store_connect \
-  skip_confirm:true \
-  skip_prechecks:true \
-  create_release:true \
-  "beta_release:${1:-true}" # use first call param, default to true for safety
+echo "--- :hammer_and_wrench: Build for App Store Connect"
+bundle exec fastlane build_for_app_store_connect

.buildkite/commands/release-upload.sh

@@ -0,0 +1,20 @@
+#!/bin/bash -eu
+
+echo "--- :arrow_down: Downloading Artifacts"
+ARTIFACTS_DIR='build/results'
+STEP=testflight_build
+buildkite-agent artifact download "$ARTIFACTS_DIR/*.ipa" . --step $STEP
+buildkite-agent artifact download "$ARTIFACTS_DIR/*.zip" . --step $STEP
+
+echo "--- :rubygems: Setting up Gems"
+install_gems
+
+echo "--- :closed_lock_with_key: Installing Secrets"
+bundle exec fastlane run configure_apply
+
+echo "--- :hammer_and_wrench: Upload to App Store Connect"
+bundle exec fastlane upload_to_app_store_connect \
+  skip_confirm:true \
+  skip_prechecks:true \
+  create_release:true \
+  "beta_release:${1:-true}" # use first call param, default to true for safety

.buildkite/release-build.yml

@@ -1,11 +1,23 @@
+env:
+  IMAGE_ID: $IMAGE_ID
+agents:
+  queue: mac
+
 steps:
-  - label: ":testflight: Simplenote iOS Release Build (App Store Connect)"
+  - label: ":testflight: Build Simplenote iOS for App Store Connect"
+    key: testflight_build
     command: .buildkite/commands/release-build.sh
     priority: 1
-    env:
-      IMAGE_ID: $IMAGE_ID
-    agents:
-      queue: mac
+    plugins: [$CI_TOOLKIT_PLUGIN]
+    artifact_paths:
+      - build/results/*.zip
+      - build/results/*.ipa
+      - build/results/*.xcarchive
+
+  - label: ":testflight: Upload Simplenote iOS to App Store Connect"
+    depends_on: testflight_build
+    command: .buildkite/commands/release-upload.sh
+    priority: 1
     plugins: [$CI_TOOLKIT_PLUGIN]
     notify:
     - slack: "#build-and-ship"