From f0e772d678a79109639bc45eae704646568a2d3a Mon Sep 17 00:00:00 2001
From: Nick Cooke <nickcooke@google.com>
Date: Wed, 12 Nov 2025 14:21:06 -0500
Subject: [PATCH] infra: Fix zip's ai artifact name and do not upload service
 plists

---
 .github/workflows/common_quickstart.yml    | 10 ++++++----
 .github/workflows/prerelease_cocoapods.yml |  8 +++++---
 .github/workflows/release_cocoapods.yml    |  8 +++++---
 .github/workflows/zip.yml                  | 10 ++++++----
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/common_quickstart.yml b/.github/workflows/common_quickstart.yml
index a3f965796ea..3ced9e62959 100644
--- a/.github/workflows/common_quickstart.yml
+++ b/.github/workflows/common_quickstart.yml
@@ -100,15 +100,17 @@ jobs:
             ${{ inputs.quickstart_type }}
     # Failure sequence to upload artifact.
     - id: lowercase_product
-      if: ${{ failure() }}
+      if: failure()
       run: |
         lowercase_product=$(echo "${{ inputs.product }}" | tr '[:upper:]' '[:lower:]')
         echo "lowercase_product=$lowercase_product" >> $GITHUB_OUTPUT
     - name: Remove data before upload.
-      if: ${{ failure() }}
+      if: failure()
       run: scripts/remove_data.sh ${{ steps.lowercase_product.outputs.lowercase_product }}
     - uses: actions/upload-artifact@v4
-      if: ${{ failure() }}
+      if: failure()
       with:
         name: quickstart_artifacts_${{ steps.lowercase_product.outputs.lowercase_product }}
-        path: quickstart-ios/
+        path: |
+          quickstart-ios/
+          !quickstart-ios/**/GoogleService-Info.plist
diff --git a/.github/workflows/prerelease_cocoapods.yml b/.github/workflows/prerelease_cocoapods.yml
index ecbbe6a1169..f74adfb6e7d 100644
--- a/.github/workflows/prerelease_cocoapods.yml
+++ b/.github/workflows/prerelease_cocoapods.yml
@@ -340,10 +340,12 @@ jobs:
         command: scripts/test_quickstart.sh ${{ matrix.product }} ${{ matrix.run_tests }}
     # Failure sequence to upload artifact.
     - name: Remove data before upload.
-      if: ${{ failure() }}
+      if: failure()
       run: scripts/remove_data.sh ${{ matrix.product }}
     - uses: actions/upload-artifact@v4
-      if: ${{ failure() }}
+      if: failure()
       with:
         name: quickstart_artifacts_${{ matrix.product }}
-        path: quickstart-ios/
+        path: |
+          quickstart-ios/
+          !quickstart-ios/**/GoogleService-Info.plist
diff --git a/.github/workflows/release_cocoapods.yml b/.github/workflows/release_cocoapods.yml
index daed367ac25..4ec26a41272 100644
--- a/.github/workflows/release_cocoapods.yml
+++ b/.github/workflows/release_cocoapods.yml
@@ -237,13 +237,15 @@ jobs:
         retry_wait_seconds: 120
         command: scripts/test_quickstart.sh ${{ matrix.product }} ${{ matrix.run_tests }} swift
     - name: Remove data before upload
-      if: ${{ failure() }}
+      if: failure()
       run: scripts/remove_data.sh ${{ matrix.product }}
     - uses: actions/upload-artifact@v4
-      if: ${{ failure() }}
+      if: failure()
       with:
         name: quickstart_artifacts_${{ matrix.product }}
-        path: quickstart-ios/
+        path: |
+          quickstart-ios/
+          !quickstart-ios/**/GoogleService-Info.plist
 
   # TODO: The functions quickstart uses Material which isn't supported by Xcode 15
   # functions_quickstart:
diff --git a/.github/workflows/zip.yml b/.github/workflows/zip.yml
index 2519d68bbca..d698a01a20a 100644
--- a/.github/workflows/zip.yml
+++ b/.github/workflows/zip.yml
@@ -509,13 +509,15 @@ jobs:
     - name: Test Quickstart
       run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_framework.sh "${SDK}")
     - name: Remove data before upload
-      if: ${{ failure() }}
+      if: failure()
       run: scripts/remove_data.sh firebaseai
     - uses: actions/upload-artifact@v4
-      if: ${{ failure() }}
+      if: failure()
       with:
-        name: quickstart_artifacts_firebaseai
-        path: quickstart-ios/
+        name: quickstart_artifacts_firebaseai_${{ matrix.artifact }}_${{ matrix.build-env.os }}
+        path: |
+          quickstart-ios/
+          !quickstart-ios/**/GoogleService-Info.plist
 
   quickstart_framework_firestore:
     needs: packaging_done