Merge branch 'main' into nc/quickstarts

Author: ncooke3

.github/workflows/common_quickstart.yml

@@ -96,15 +96,17 @@ jobs:
             ${{ inputs.run_tests }}
     # 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

.github/workflows/zip.yml

@@ -499,13 +499,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