diff --git a/.github/workflows/firestore.yml b/.github/workflows/firestore.yml
index b5822e648c1d..f9b652c685d5 100644
--- a/.github/workflows/firestore.yml
+++ b/.github/workflows/firestore.yml
@@ -431,6 +431,8 @@ jobs:
 
   spm-package-resolved:
     runs-on: macos-14
+    env:
+      FIREBASE_SOURCE_FIRESTORE: 1
     outputs:
       cache_key: ${{ steps.generate_cache_key.outputs.cache_key }}
     steps:
@@ -448,7 +450,7 @@ jobs:
         id: cache
         with:
           path: .build
-          key: ${{ steps.generate_cache_key.outputs.cache_key }
+          key: ${{ steps.generate_cache_key.outputs.cache_key }}
 
   spm-source:
     needs: [check, spm-package-resolved]
diff --git a/.github/workflows/functions.yml b/.github/workflows/functions.yml
index 31ebaa6136f4..d4207217be32 100644
--- a/.github/workflows/functions.yml
+++ b/.github/workflows/functions.yml
@@ -79,7 +79,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-14]
-        xcode: Xcode_15.4
+        xcode: [Xcode_15.4]
     runs-on: ${{ matrix.os }}
     env:
       FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1