From dc5c2949e4e59eb79c899b8c8b4d84fa5225fbfe Mon Sep 17 00:00:00 2001 From: Andrew Heard Date: Thu, 14 Nov 2024 12:40:08 -0500 Subject: [PATCH 1/2] [Infra] Switch to iPhone 15 simulator in build_with_environment.sh --- .../CocoapodsIntegrationTest/scripts/build_with_environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IntegrationTesting/CocoapodsIntegrationTest/scripts/build_with_environment.sh b/IntegrationTesting/CocoapodsIntegrationTest/scripts/build_with_environment.sh index 1c45d2521fd..58c7c968f9c 100755 --- a/IntegrationTesting/CocoapodsIntegrationTest/scripts/build_with_environment.sh +++ b/IntegrationTesting/CocoapodsIntegrationTest/scripts/build_with_environment.sh @@ -27,7 +27,7 @@ function runXcodebuild() { -workspace 'CocoapodsIntegrationTest.xcworkspace' -scheme 'CocoapodsIntegrationTest' -sdk 'iphonesimulator' - -destination 'platform=iOS Simulator,name=iPhone 14' + -destination 'platform=iOS Simulator,name=iPhone 15' CODE_SIGNING_REQUIRED=NO clean build From 63960fc870c9d5917ecbaef479f32300c1262b91 Mon Sep 17 00:00:00 2001 From: Andrew Heard Date: Thu, 14 Nov 2024 12:40:30 -0500 Subject: [PATCH 2/2] Switch from xcpretty to xcbeautify --- .../CocoapodsIntegrationTest/scripts/build_with_environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IntegrationTesting/CocoapodsIntegrationTest/scripts/build_with_environment.sh b/IntegrationTesting/CocoapodsIntegrationTest/scripts/build_with_environment.sh index 58c7c968f9c..10900343894 100755 --- a/IntegrationTesting/CocoapodsIntegrationTest/scripts/build_with_environment.sh +++ b/IntegrationTesting/CocoapodsIntegrationTest/scripts/build_with_environment.sh @@ -36,7 +36,7 @@ function runXcodebuild() { parameters=("${buildcache_xcb_flags[@]}" "${parameters[@]}") echo xcodebuild "${parameters[@]}" - xcodebuild "${parameters[@]}" | xcpretty; result=$? + xcodebuild "${parameters[@]}" | xcbeautify --renderer github-actions; result=$? } # Configures bundler environment using Gemfile at the specified path.