From 8cfaf2e5f21623fec3c376fe92a144a2dcdcaf2b Mon Sep 17 00:00:00 2001
From: Andrew Heard <andrewheard@google.com>
Date: Mon, 7 Oct 2024 17:50:20 -0400
Subject: [PATCH] [Vertex AI] Sample app CI for Xcode 16 (#13833)

---
 .github/workflows/vertexai.yml | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/vertexai.yml b/.github/workflows/vertexai.yml
index 2e427be3bb7..bd7302413c5 100644
--- a/.github/workflows/vertexai.yml
+++ b/.github/workflows/vertexai.yml
@@ -16,7 +16,16 @@ concurrency:
 
 jobs:
   spm-package-resolved:
-    runs-on: macos-14
+    strategy:
+      matrix:
+        include:
+          - os: macos-13
+            xcode: Xcode_15.2
+          - os: macos-14
+            xcode: Xcode_15.4
+          - os: macos-15
+            xcode: Xcode_16
+    runs-on: ${{ matrix.os }}
     outputs:
       cache_key: ${{ steps.generate_cache_key.outputs.cache_key }}
     env:
@@ -30,7 +39,7 @@ jobs:
       - name: Generate cache key
         id: generate_cache_key
         run: |
-          cache_key="${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}"
+          cache_key="${{ matrix.os }}-spm-${{ hashFiles('**/Package.resolved') }}"
           echo "cache_key=${cache_key}" >> "$GITHUB_OUTPUT"
       - uses: actions/cache/save@v4
         id: cache
@@ -129,13 +138,13 @@ jobs:
   sample:
     strategy:
       matrix:
-        # Test build with debug and release configs (whether or not DEBUG is set and optimization level)
-        build: [build]
         include:
           - os: macos-13
-            xcode: Xcode_15.0.1
-          - os: macos-14
             xcode: Xcode_15.2
+          - os: macos-14
+            xcode: Xcode_15.4
+          - os: macos-15
+            xcode: Xcode_16
     runs-on: ${{ matrix.os }}
     needs: spm-package-resolved
     env: