From b6fe4d44359dd982d6d65a990172d92dddaf8d83 Mon Sep 17 00:00:00 2001
From: Clare So <cso@mozilla.com>
Date: Thu, 19 Dec 2024 16:00:27 -0500
Subject: [PATCH] Let's use the same arguments on previous-os.yml

---
 .../focus-ios-ui-tests-previous-os.yml        | 38 +++++++++++--------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/focus-ios-ui-tests-previous-os.yml b/.github/workflows/focus-ios-ui-tests-previous-os.yml
index 25bed25c3794..6b49b734017d 100644
--- a/.github/workflows/focus-ios-ui-tests-previous-os.yml
+++ b/.github/workflows/focus-ios-ui-tests-previous-os.yml
@@ -7,6 +7,8 @@ on:
 env:
     browser: focus-ios
     xcode_version: 16.2
+    xcodebuild_scheme: Focus
+    xcodebuild_target: XCUITest
     test_results_directory: /Users/runner/tmp
 
 jobs:
@@ -54,35 +56,39 @@ jobs:
       - name: Build Focus
         id: compile
         run: |
-          xcodebuild build-for-testing \
-            -project Blockzilla.xcodeproj -scheme Focus \
-            -configuration FocusDebug \
-            CODE_SIGNING_ALLOWED=NO -destination \
-            'platform=iOS Simulator,name=${{ matrix.ios_simulator }},OS=${{ matrix.ios_version }}'
+          xcodebuild \
+            build-for-testing \
+            -scheme ${{ env.xcodebuild_scheme }} \
+            -target ${{ env.xcodebuild_target }} \
+            -derivedDataPath ~/DerivedData \
+            -destination 'platform=iOS Simulator,name=${{ matrix.ios_simulator }},OS=${{ matrix.ios_version }}' \
+            COMPILER_INDEX_STORE_ENABLE=NO CODE_SIGN_IDENTITY= CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO ARCH="arm64"
         working-directory:  ${{ env.browser }}
       - name: Run smoke tests
         id: run-smoketests
         run: |
-          xcodebuild test-without-building \
-            -project Blockzilla.xcodeproj -scheme Focus \
-            -configuration FocusDebug \
-            CODE_SIGNING_ALLOWED=NO \
+          xcodebuild \
+            test-without-building \
+            -scheme ${{ env.xcodebuild_scheme }} \
+            -target ${{ env.xcodebuild_target }} \
+            -derivedDataPath ~/DerivedData \
             -destination 'platform=iOS Simulator,name=${{ matrix.ios_simulator }},OS=${{ matrix.ios_version }}' \
             -testPlan SmokeTest \
-            -resultBundlePath ${{ env.test_results_directory }}/results-smoketests \
-            | tee xcodebuild-smoketests.log | xcpretty -r junit --output ./junit-smoketests.xml && exit ${PIPESTATUS[0]}
+            -resultBundlePath ${{ env.test_results_directory }}/results \
+            | tee xcodebuild-smoketests.log | xcpretty _0.3.0_ -r junit --output ./junit-smoketests.xml && exit ${PIPESTATUS[0]}
         working-directory: ${{ env.browser }}
         continue-on-error: true
       - name: Run full functional tests
         id: run-fullfunctionaltests
         run: |
-          xcodebuild test-without-building \
-            -project Blockzilla.xcodeproj -scheme Focus \
-            -configuration FocusDebug \
-            CODE_SIGNING_ALLOWED=NO \
+          xcodebuild \
+            test-without-building \
+            -scheme ${{ env.xcodebuild_scheme }} \
+            -target ${{ env.xcodebuild_target }} \
+            -derivedDataPath ~/DerivedData \
             -destination 'platform=iOS Simulator,name=${{ matrix.ios_simulator }},OS=${{ matrix.ios_version }}' \
             -testPlan FullFunctionalTests \
-            -resultBundlePath ${{ env.test_results_directory }}/results-fullfunctionaltests \
+            -resultBundlePath ${{ env.test_results_directory }}/results \
             | tee xcodebuild-fullfunctionaltests.log | xcpretty _0.3.0_ -r junit --output ./junit-fullfunctionaltests.xml && exit ${PIPESTATUS[0]}
         working-directory: ${{ env.browser }}
         continue-on-error: true