From 39706f7ea8d7941354cbc627bf21a207d4574ffc Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Fri, 3 Oct 2025 09:07:01 -0400
Subject: [PATCH 1/5] chore(ci): Upload build log in spm.yml job

---
 .github/workflows/spm.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/spm.yml b/.github/workflows/spm.yml
index e23f4703bfd..204cb637a3d 100644
--- a/.github/workflows/spm.yml
+++ b/.github/workflows/spm.yml
@@ -85,6 +85,11 @@ jobs:
         max_attempts: 3
         retry_wait_seconds: 120
         command: scripts/build.sh Firebase-Package iOS ${{ matrix.test }}
+    - uses: actions/upload-artifact@v4
+      if: ${{ failure() }}
+      with:
+        name: spm-build-run-${{ matrix.os }}-${{ matrix.xcode }}-xcodebuild-build.log
+        path: xcodebuild-build.log
 
   # Test iOS Device build since some Firestore dependencies build different files.
   iOS-Device:

From 011b61586abb9bd45c3dd71353cbfdf4f0135ccd Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Fri, 3 Oct 2025 09:30:01 -0400
Subject: [PATCH 2/5] Update .github/workflows/spm.yml

---
 .github/workflows/spm.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/spm.yml b/.github/workflows/spm.yml
index 204cb637a3d..7e6c85796e8 100644
--- a/.github/workflows/spm.yml
+++ b/.github/workflows/spm.yml
@@ -89,7 +89,8 @@ jobs:
       if: ${{ failure() }}
       with:
         name: spm-build-run-${{ matrix.os }}-${{ matrix.xcode }}-xcodebuild-build.log
-        path: xcodebuild-build.log
+        path: xcodebuild-test.log
+        if-no-files-found: error
 
   # Test iOS Device build since some Firestore dependencies build different files.
   iOS-Device:

From eaf9be4fa51a8ce24f8d1b8ea4f9dbcd65c29926 Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Fri, 3 Oct 2025 09:30:08 -0400
Subject: [PATCH 3/5] Update .github/workflows/spm.yml

---
 .github/workflows/spm.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/spm.yml b/.github/workflows/spm.yml
index 7e6c85796e8..f301e56d8e3 100644
--- a/.github/workflows/spm.yml
+++ b/.github/workflows/spm.yml
@@ -88,7 +88,7 @@ jobs:
     - uses: actions/upload-artifact@v4
       if: ${{ failure() }}
       with:
-        name: spm-build-run-${{ matrix.os }}-${{ matrix.xcode }}-xcodebuild-build.log
+        name: spm-build-run-${{ matrix.os }}-${{ matrix.xcode }}-xcodebuild-test.log
         path: xcodebuild-test.log
         if-no-files-found: error
 

From 954046c79700b8a45c3ff28fa6a735bedefd64cd Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Fri, 3 Oct 2025 09:30:35 -0400
Subject: [PATCH 4/5] Update spm.yml

---
 .github/workflows/spm.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/spm.yml b/.github/workflows/spm.yml
index f301e56d8e3..1952d61aae9 100644
--- a/.github/workflows/spm.yml
+++ b/.github/workflows/spm.yml
@@ -124,6 +124,7 @@ jobs:
       with:
         name: spm-ios-device-${{ matrix.os }}-${{ matrix.xcode }}-xcodebuild-build.log
         path: xcodebuild-build.log
+        if-no-files-found: error
 
   platforms:
     # Don't run on private repo unless it is a PR.
@@ -164,4 +165,5 @@ jobs:
       with:
         name: spm-platforms-${{ matrix.target }}-${{ matrix.os }}-${{ matrix.xcode }}-logs
         path: xcodebuild-*.log
+        if-no-files-found: error
 

From 15ffcde6a3816085e37ccd3e6a7b9db1c1a2106f Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Fri, 3 Oct 2025 09:33:10 -0400
Subject: [PATCH 5/5] generalize artifact upload

---
 .github/workflows/spm.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/spm.yml b/.github/workflows/spm.yml
index 1952d61aae9..eb0dba8c438 100644
--- a/.github/workflows/spm.yml
+++ b/.github/workflows/spm.yml
@@ -88,8 +88,8 @@ jobs:
     - uses: actions/upload-artifact@v4
       if: ${{ failure() }}
       with:
-        name: spm-build-run-${{ matrix.os }}-${{ matrix.xcode }}-xcodebuild-test.log
-        path: xcodebuild-test.log
+        name: spm-build-run-${{ matrix.os }}-${{ matrix.xcode }}-logs
+        path: xcodebuild-*.log
         if-no-files-found: error
 
   # Test iOS Device build since some Firestore dependencies build different files.
@@ -122,8 +122,8 @@ jobs:
     - uses: actions/upload-artifact@v4
       if: ${{ failure() }}
       with:
-        name: spm-ios-device-${{ matrix.os }}-${{ matrix.xcode }}-xcodebuild-build.log
-        path: xcodebuild-build.log
+        name: spm-ios-device-${{ matrix.os }}-${{ matrix.xcode }}-logs
+        path: xcodebuild-*.log
         if-no-files-found: error
 
   platforms: