Fix cmake ci (#12071)

firebase · Nov 8, 2023 · 0c1c1ca · 0c1c1ca
1 parent 8329c4c
commit 0c1c1ca
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/.github/workflows/firestore.yml b/.github/workflows/firestore.yml
@@ -130,6 +130,10 @@ jobs:
         key: ${{ runner.os }}-mint-${{ hashFiles('**/Mintfile') }}
         restore-keys: ${{ runner.os }}-mint-
 
+    - uses: actions/setup-python@v4
+      with:
+        python-version: '3.7'
+
     - name: Setup build
       run:  scripts/install_prereqs.sh Firestore ${{ runner.os }} cmake
 
@@ -176,6 +180,10 @@ jobs:
         key: ${{ runner.os }}-mint-${{ hashFiles('**/Mintfile') }}
         restore-keys: ${{ runner.os }}-mint-
 
+    - uses: actions/setup-python@v4
+      with:
+        python-version: '3.7'
+
     - name: Install Secret GoogleService-Info.plist
       run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/firestore.plist.gpg \
         Firestore/Example/App/GoogleService-Info.plist "$plist_secret"
@@ -252,6 +260,10 @@ jobs:
         restore-keys: |
           ${{ matrix.sanitizer }}-firestore-ccache-${{ runner.os }}-
 
+    - uses: actions/setup-python@v4
+      with:
+        python-version: '3.7'
+
     - name: Setup build
       run:  scripts/install_prereqs.sh Firestore ${{ runner.os }} cmake
 

diff --git a/cmake/GoogleUtilities.cmake b/cmake/GoogleUtilities.cmake
@@ -20,13 +20,14 @@ endif()
 file(
   GLOB sources
   ${FIREBASE_EXTERNAL_SOURCE_DIR}/GoogleUtilities/GoogleUtilities/Environment/*.m
-  ${FIREBASE_EXTERNAL_SOURCE_DIR}/GoogleUtilities/GoogleUtilities/Environment/third_party/*.m
+  ${FIREBASE_EXTERNAL_SOURCE_DIR}/GoogleUtilities/third_party/IsAppEncrypted/*.m
   ${FIREBASE_EXTERNAL_SOURCE_DIR}/GoogleUtilities/GoogleUtilities/Logger/*.m
 )
 file(
   GLOB headers
   ${FIREBASE_EXTERNAL_SOURCE_DIR}/GoogleUtilities/GoogleUtilities/Environment/Public/GoogleUtilities/*.h
   ${FIREBASE_EXTERNAL_SOURCE_DIR}/GoogleUtilities/GoogleUtilities/Logger/Public/GoogleUtilities/*.h
+  ${FIREBASE_EXTERNAL_SOURCE_DIR}/GoogleUtilities/third_party/IsAppEncrypted/Public/*.h
 )
 
 firebase_ios_add_framework(