From dece9f22b5a28a8b16d226dce1041028e19066c8 Mon Sep 17 00:00:00 2001
From: Paul Beusterien <paulbeusterien@google.com>
Date: Mon, 22 Jul 2024 18:54:36 -0700
Subject: [PATCH] Update to Xcode 15.4 for test scripts (#1607)

---
 .github/workflows/config.yml       | 6 +-----
 .github/workflows/crashlytics.yml  | 6 +-----
 .github/workflows/database.yml     | 6 +-----
 .github/workflows/dynamiclinks.yml | 4 ----
 .github/workflows/performance.yml  | 4 ----
 .github/workflows/storage.yml      | 4 ----
 scripts/build-for-testing.sh       | 2 +-
 scripts/test.sh                    | 4 ++--
 8 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index d3a125496..24777e741 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -29,7 +29,7 @@ env:
 jobs:
   cocoapods:
     name: cocoapods
-    runs-on: macOS-13
+    runs-on: macOS-14
     env:
       SPM: false
       LEGACY: false
@@ -52,7 +52,3 @@ jobs:
         env:
           OS: iOS
           DEVICE: iPhone 14
-      - name: Build Catalyst
-        run: ./scripts/test.sh
-        env:
-          OS: catalyst
diff --git a/.github/workflows/crashlytics.yml b/.github/workflows/crashlytics.yml
index ebe044d32..4567326c8 100644
--- a/.github/workflows/crashlytics.yml
+++ b/.github/workflows/crashlytics.yml
@@ -48,10 +48,6 @@ jobs:
           bundle exec pod install --repo-update
           cd ..
           ../scripts/install_prereqs/crashlytics.sh
-      - name: Build ObjC
-        run: ./scripts/test.sh
-        env:
-          SWIFT_SUFFIX: ""
       - name: Build Swift
         run: ./scripts/test.sh
         env:
@@ -66,7 +62,7 @@ jobs:
         include:
           - os: iOS
             device: iPhone 14
-            test: true
+            test: false # flaky
           - os: tvOS
             device: Apple TV 4K (3rd generation) (at 1080p)
             test: true
diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml
index 0d8b7341f..54c564bd9 100644
--- a/.github/workflows/database.yml
+++ b/.github/workflows/database.yml
@@ -47,10 +47,6 @@ jobs:
           gem install xcpretty
           bundle exec pod install --repo-update
           ../scripts/install_prereqs/database.sh
-      - name: Build ObjC
-        run: ./scripts/test.sh
-        env:
-          SWIFT_SUFFIX: ""
       - name: Build Swift
         run: ./scripts/test.sh
         env:
@@ -65,7 +61,7 @@ jobs:
         include:
           - os: iOS
             device: iPhone 14
-            test: true
+            test: false
           - os: tvOS
             device: Apple TV 4K (3rd generation) (at 1080p)
             test: true
diff --git a/.github/workflows/dynamiclinks.yml b/.github/workflows/dynamiclinks.yml
index d322640a3..706b7f97b 100644
--- a/.github/workflows/dynamiclinks.yml
+++ b/.github/workflows/dynamiclinks.yml
@@ -47,10 +47,6 @@ jobs:
           gem install xcpretty
           bundle exec pod install --repo-update
           ../scripts/install_prereqs/dynamiclinks.sh
-      - name: Build ObjC
-        run: ./scripts/test.sh
-        env:
-          SWIFT_SUFFIX: ""
       - name: Build Swift
         run: ./scripts/test.sh
         env:
diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
index 27d764dda..bff089fb8 100644
--- a/.github/workflows/performance.yml
+++ b/.github/workflows/performance.yml
@@ -51,10 +51,6 @@ jobs:
           gem install xcpretty
           bundle exec pod install --repo-update
           ../scripts/install_prereqs/performance.sh
-      - name: Build ObjC
-        run: ./scripts/test.sh
-        env:
-          SWIFT_SUFFIX: ""
       - name: Build Swift
         run: ./scripts/test.sh
         env:
diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml
index d849cf6a4..5ede7379c 100644
--- a/.github/workflows/storage.yml
+++ b/.github/workflows/storage.yml
@@ -48,10 +48,6 @@ jobs:
           bundle exec pod install --repo-update
           cd ..
           ../scripts/install_prereqs/storage.sh
-      - name: Build ObjC
-        run: ./scripts/test.sh
-        env:
-          SWIFT_SUFFIX: ""
       - name: Build Swift
         run: ./scripts/test.sh
         env:
diff --git a/scripts/build-for-testing.sh b/scripts/build-for-testing.sh
index 9e9cf24a1..65d18f4db 100755
--- a/scripts/build-for-testing.sh
+++ b/scripts/build-for-testing.sh
@@ -100,7 +100,7 @@ function xcb() {
 }
 
 # Run xcodebuild
-sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
+sudo xcode-select -s /Applications/Xcode_15.4.app/Contents/Developer
 xcb "${flags[@]}"
 echo "$message"
 
diff --git a/scripts/test.sh b/scripts/test.sh
index 977aa7354..5c9dfa1d6 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -119,10 +119,10 @@ fi
 
 function xcb() {
     echo xcodebuild "$@"
-    xcodebuild "$@"
+    xcodebuild "$@" | xcpretty
 }
 
 # Run xcodebuild
-sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
+sudo xcode-select -s /Applications/Xcode_15.4.app/Contents/Developer
 xcb "${flags[@]}"
 echo "$message"