From 0c1c1ca09c96a0688e8808357839d86b2e89e9f8 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Tue, 7 Nov 2023 17:35:28 -0800 Subject: [PATCH] Fix cmake ci (#12071) --- .github/workflows/firestore.yml | 12 ++++++++++++ cmake/GoogleUtilities.cmake | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/firestore.yml b/.github/workflows/firestore.yml index 6a2d1d1be94..d7dcfa8e15f 100644 --- 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 index f57b8e286a4..127c5d61da1 100644 --- 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(