From bfb059d4ff63ef45f1703013561731953057b605 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 1 Sep 2023 15:28:36 -0400
Subject: SL-19243: Try harder to list contents of xcarchive.zip.

upload-mac-symbols.sh actually moves the xcarchive.zip file to /tmp, which is
why we couldn't find it when trying to list its contents after the upload.
---
 build.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index ba8c4dfc8a..18b0e8df6f 100755
--- a/build.sh
+++ b/build.sh
@@ -604,6 +604,13 @@ then
       ## SL-19243 HACK: testing separate GH upload job on Windows
       if [[ "$arch" != "CYGWIN" ]]
       then
+          # SL-19243 HACK: List contents of xcarchive.zip, before running
+          # upload-mac-symbols.sh which moves it to /tmp
+          if [[ "$arch" == "Darwin" ]]
+          then
+              # e.g. build-darwin-x86_64/newview/Release/Second Life Test.xcarchive.zip
+              unzip -l "${build_dir}/newview/${variant}/${viewer_channel}.xcarchive.zip"
+          fi
           if [ -d ${build_dir}/packages/upload-extensions ]; then
               for extension in ${build_dir}/packages/upload-extensions/*.sh; do
                   begin_section "Upload Extension $extension"
@@ -613,13 +620,6 @@ then
                   end_section "Upload Extension $extension"
               done
           fi
-          # SL-19243 HACK: List contents of xcarchive.zip
-          if [[ "$arch" == "Darwin" ]]
-          then
-              app_dir="${build_dir}/newview/${variant}"
-              xcarchive="$(ls -d "${app_dir}"/*.xcarchive.zip)"
-              unzip -l "$xcarchive"
-          fi
       fi
     fi
     end_section "Uploads"
-- 
cgit v1.2.3