From 22c0e38c5d4214ed8d35b5f10440ba5dc1b7a9fc Mon Sep 17 00:00:00 2001
From: Doug <6060466+pixlwave@users.noreply.github.com>
Date: Mon, 7 Aug 2023 14:52:54 +0100
Subject: [PATCH] Upload to sentry before releasing/tagging. (#1457)

This is to prevent tags being created for CI runs that have failed.
---
 changelog.d/pr-1457.build        |  1 +
 ci_scripts/ci_post_xcodebuild.sh |  7 ++++---
 fastlane/Fastfile                | 22 ----------------------
 3 files changed, 5 insertions(+), 25 deletions(-)
 create mode 100644 changelog.d/pr-1457.build

diff --git a/changelog.d/pr-1457.build b/changelog.d/pr-1457.build
new file mode 100644
index 0000000000..9e6e67325d
--- /dev/null
+++ b/changelog.d/pr-1457.build
@@ -0,0 +1 @@
+Make CI upload dSyms to Sentry before releasing to GitHub to avoid tagging failed runs.
\ No newline at end of file
diff --git a/ci_scripts/ci_post_xcodebuild.sh b/ci_scripts/ci_post_xcodebuild.sh
index 28ada53d89..7c9849bc1e 100755
--- a/ci_scripts/ci_post_xcodebuild.sh
+++ b/ci_scripts/ci_post_xcodebuild.sh
@@ -4,6 +4,10 @@ source ci_common.sh
 
 setup_xcode_cloud_environment
 
+# Upload dsyms no matter the workflow
+# Perform this step before releasing to github in case it fails.
+bundle exec fastlane upload_dsyms_to_sentry dsym_path:"$CI_ARCHIVE_PATH/dSYMs"
+
 if [ "$CI_WORKFLOW" = "Release" ]; then
     install_xcode_cloud_python_dependencies
 
@@ -12,6 +16,3 @@ if [ "$CI_WORKFLOW" = "Release" ]; then
 elif [ "$CI_WORKFLOW" = "Nightly" ]; then
     bundle exec fastlane tag_nightly build_number:"$CI_BUILD_NUMBER"
 fi
-
-# Upload dsyms no matter the workflow
-bundle exec fastlane upload_dsyms_to_sentry dsym_path:"$CI_ARCHIVE_PATH/dSYMs"
\ No newline at end of file
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 419eb8339c..c4e44e65d3 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -73,28 +73,6 @@ lane :alpha do
   upload_to_browserstack()
 end
 
-lane :app_store_release do
-  build_release()
-
-  release_to_github()
-
-  prepare_next_release()
-
-  upload_dsyms_to_sentry(dsym_path: './build/ElementX.app.dSYM.zip')
-end
-
-lane :build_release do
-  bump_build_number()
-
-  build_ios_app(
-    scheme: "ElementX",
-    clean: true,
-    export_method: "app-store",
-    output_directory: "build",
-    xcargs: "-allowProvisioningUpdates",
-  )
-end
-
 lane :unit_tests do
   run_tests(
     scheme: "UnitTests",