From f53af84e9a8e087a058c009e7da3da1316a09a2d Mon Sep 17 00:00:00 2001
From: Geoff Powell <gpowell@squareup.com>
Date: Wed, 20 Dec 2023 06:34:28 -0500
Subject: [PATCH] Upload iOS App to testflight

---
 .github/workflows/ios.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
index 97b5794..4c87e49 100644
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@@ -4,6 +4,7 @@ on:
   push: 
     branches: 
       - main
+      - ios-upload-testflight # TODO: this is a temporary branch for testing (REMOVE)
   pull_request:
 
 concurrency:
@@ -61,7 +62,7 @@ jobs:
         with:
           gradle-home-cache-cleanup: true
 
-      - name: Build with Xcode
+      - name: Build Artifact with Xcode
         run: xcodebuild -project iosApp/iosApp.xcodeproj -scheme iosApp -configuration Debug -destination generic/platform=iOS -archivePath $RUNNER_TEMP/Tidy.xcarchive
 
       - name: Upload Archive Artifacts
@@ -71,23 +72,21 @@ jobs:
           path: $RUNNER_TEMP/Tidy/**/*.xcarchive
 
       # Only run the following steps when a push event occurs on main branch
-      - name: Build App Artifact with Xcode
+      - name: Build IPA Artifact with Xcode
         if: github.event_name == 'push'
         env:
-          EXPORT_OPTIONS_PLIST: ${{ secrets.IOS_EXPORT_OPTIONS }}
+          IOS_EXPORT_OPTIONS: ${{ secrets.IOS_EXPORT_OPTIONS }}
         run: |
           EXPORT_OPTS_PATH=$RUNNER_TEMP/ExportOptions.plist
-          echo -n "IOS_EXPORT_OPTIONS" | base64 --decode -o $RUNNER_TEMP/exportOptions.plist
-          xcodebuild -archivePath $RUNNER_TEMP/iosApp.xcarchive
-              -exportArchive -exportPath '$RUNNER_TEMP/Tidy.app'
-              -exportOptionsPlist $RUNNER_TEMP/exportOptions.plist
+          echo -n "IOS_EXPORT_OPTIONS" | base64 --decode -o $EXPORT_OPTS_PATH
+          xcodebuild -exportArchive -archivePath $RUNNER_TEMP/iosApp.xcarchive -exportPath '$RUNNER_TEMP/Tidy.ipa' -exportOptionsPlist $EXPORT_OPTS_PATH
 
       - name: Upload to Github Artifacts
         if: github.event_name == 'push'
         uses: actions/upload-artifact@v3
         with:
           name: app
-          path: $RUNNER_TEMP/**/*.app
+          path: $RUNNER_TEMP/**/*.ipa
 
       - name: Copy App Store Private Key
         if: github.event_name == 'push'