From e566cb307e816c6277b6a977310cbe5eccc2e8c5 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 22 Jul 2024 16:15:51 +0300
Subject: [PATCH] Bugslat now uses parentheses for macOS

"app_name - bundle_version (short_version)" which end up looking like
Second Life Release-7.1.9.9981869229 (7.1.9.9981869229)
---
 .github/workflows/build.yaml     | 2 +-
 BugsplatMac/upload-archive-cl.sh | 2 +-
 BugsplatMac/upload-archive.sh    | 2 +-
 BugsplatMac/upload-symbols.sh    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index e4c34b7..bd570dc 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -4,7 +4,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [windows-2022, macos-11]
+        os: [windows-2022, macos-12-xl]
         addrsize: ["64"]
         include:
           - os: windows-2022
diff --git a/BugsplatMac/upload-archive-cl.sh b/BugsplatMac/upload-archive-cl.sh
index f2d7958..5663f4d 100755
--- a/BugsplatMac/upload-archive-cl.sh
+++ b/BugsplatMac/upload-archive-cl.sh
@@ -78,4 +78,4 @@ curl -b "${COOKIEPATH}" -c "${COOKIEPATH}" --data-urlencode "currusername=${BUGS
 
 echo "Uploading /tmp/${PRODUCT_NAME}.xcarchive.zip to ${UPLOAD_URL}" >> $LOG 2>&1
 
-curl -i -b "${COOKIEPATH}" -c "${COOKIEPATH}" -F filedata=@"/tmp/${PRODUCT_NAME}.xcarchive.zip" -F appName="${PRODUCT_NAME}" -F appVer="${APP_VERSION}" -F buildId="${UUID_CMD_OUT}" $UPLOAD_URL >> $LOG 2>&1
+curl -i -b "${COOKIEPATH}" -c "${COOKIEPATH}" -F filedata=@"/tmp/${PRODUCT_NAME}.xcarchive.zip" -F appName="${PRODUCT_NAME}" -F appVer="${APP_VERSION} (${APP_VERSION})" -F buildId="${UUID_CMD_OUT}" $UPLOAD_URL >> $LOG 2>&1
diff --git a/BugsplatMac/upload-archive.sh b/BugsplatMac/upload-archive.sh
index df5723f..c0fd01d 100755
--- a/BugsplatMac/upload-archive.sh
+++ b/BugsplatMac/upload-archive.sh
@@ -72,4 +72,4 @@ curl -b "${COOKIEPATH}" -c "${COOKIEPATH}" --data-urlencode "currusername=${BUGS
 
 echo "Uploading /tmp/${PRODUCT_NAME}.xcarchive.zip to ${UPLOAD_URL}" >> $LOG 2>&1
 
-curl -i -b "${COOKIEPATH}" -c "${COOKIEPATH}" -F filedata=@"/tmp/${PRODUCT_NAME}.xcarchive.zip" -F appName="${PRODUCT_NAME}" -F appVer="${APP_VERSION}" -F buildId="${UUID_CMD_OUT}" $UPLOAD_URL >> $LOG 2>&1
+curl -i -b "${COOKIEPATH}" -c "${COOKIEPATH}" -F filedata=@"/tmp/${PRODUCT_NAME}.xcarchive.zip" -F appName="${PRODUCT_NAME}" -F appVer="${APP_VERSION} (${APP_VERSION})" -F buildId="${UUID_CMD_OUT}" $UPLOAD_URL >> $LOG 2>&1
diff --git a/BugsplatMac/upload-symbols.sh b/BugsplatMac/upload-symbols.sh
index f30446e..bd82afb 100644
--- a/BugsplatMac/upload-symbols.sh
+++ b/BugsplatMac/upload-symbols.sh
@@ -122,4 +122,4 @@ curl -b "${COOKIEPATH}" -c "${COOKIEPATH}" --data-urlencode "currusername=${BUGS
 
 echo "Uploading ${FILE} to ${UPLOAD_URL}"
 
-curl -i -b "${COOKIEPATH}" -c "${COOKIEPATH}" -F filedata=@"${FILE}" -F appName="${PRODUCT_NAME}" -F appVer="${APP_VERSION}" -F buildId="${UUID_CMD_OUT}" $UPLOAD_URL
+curl -i -b "${COOKIEPATH}" -c "${COOKIEPATH}" -F filedata=@"${FILE}" -F appName="${PRODUCT_NAME}" -F appVer="${APP_VERSION} (${APP_VERSION})" -F buildId="${UUID_CMD_OUT}" $UPLOAD_URL