From f13caf0c9374dac6270ae1a976c549174a5146f5 Mon Sep 17 00:00:00 2001
From: Thilo Molitor <thilo@monal-im.org>
Date: Sun, 4 Aug 2024 07:59:58 +0200
Subject: [PATCH] Fix non-alpha build upload script

---
 .github/workflows/beta.build-push.yml   | 5 ++++-
 .github/workflows/stable.build-push.yml | 5 ++++-
 scripts/push_xmpp.org.sh                | 2 +-
 scripts/uploadNonAlpha.sh               | 3 ---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/beta.build-push.yml b/.github/workflows/beta.build-push.yml
index f5e5465d23..790700f5f0 100644
--- a/.github/workflows/beta.build-push.yml
+++ b/.github/workflows/beta.build-push.yml
@@ -203,7 +203,10 @@ jobs:
           path: Monal/build/app/Monal.pkg
           if-no-files-found: error
       - name: Upload new catalyst beta to monal-im.org
-        run: ./scripts/uploadNonAlpha.sh beta
+        env:
+          UPLOAD_TYPE: beta
+          buildNumber: ${{ steps.releasenotes.outputs.buildNumber }}
+        run: ./scripts/uploadNonAlpha.sh
       - name: Publish catalyst to appstore connect
         #run:  xcrun altool --upload-app --file ./Monal/build/app/Monal.pkg --type macos --asc-provider S8D843U34Y -u "$(cat /Users/ci/apple_connect_upload_mail.txt)" -p "$(cat /Users/ci/apple_connect_upload_secret.txt)" --primary-bundle-id org.monal-im.prod.catalyst.monal
         env:
diff --git a/.github/workflows/stable.build-push.yml b/.github/workflows/stable.build-push.yml
index da24ed9a53..bd29023fbc 100644
--- a/.github/workflows/stable.build-push.yml
+++ b/.github/workflows/stable.build-push.yml
@@ -175,7 +175,10 @@ jobs:
           path: Monal/build/app/Monal.pkg
           if-no-files-found: error
       - name: Upload new catalyst stable to monal-im.org
-        run: ./scripts/uploadNonAlpha.sh stable
+        env:
+          UPLOAD_TYPE: stable
+          buildNumber: ${{ steps.releasenotes.outputs.buildNumber }}
+        run: ./scripts/uploadNonAlpha.sh
       - name: Publish catalyst to appstore connect
         #run: xcrun altool --upload-app --file ./Monal/build/app/Monal.pkg --type macos --asc-provider S8D843U34Y -u "$(cat /Users/ci/apple_connect_upload_mail.txt)" -p "$(cat /Users/ci/apple_connect_upload_secret.txt)" --primary-bundle-id maccatalyst.G7YU7X7KRJ.SworIM
         env:
diff --git a/scripts/push_xmpp.org.sh b/scripts/push_xmpp.org.sh
index b2d3db3471..dc9fda2875 100755
--- a/scripts/push_xmpp.org.sh
+++ b/scripts/push_xmpp.org.sh
@@ -9,7 +9,7 @@ echo ""
 echo "**********************************************"
 echo "* Reading buildNumber and creating timestamp *"
 echo "**********************************************"
-buildNumber=$(git tag --sort="v:refname" |grep "Build_iOS" | tail -n1 | sed 's/Build_iOS_//g')
+buildNumber=$(git tag --sort="v:refname" | grep -v "Quicksy_Build_iOS" | grep "Build_iOS" | tail -n1 | sed 's/Build_iOS_//g')
 timestamp="$(date -u +%FT%T)"
 
 echo ""
diff --git a/scripts/uploadNonAlpha.sh b/scripts/uploadNonAlpha.sh
index 0e327a3478..da39562ece 100755
--- a/scripts/uploadNonAlpha.sh
+++ b/scripts/uploadNonAlpha.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 
-UPLOAD_TYPE=$1
-
 function sftp_upload {
-    buildNumber=$(git tag --sort="v:refname" |grep "Build_iOS" | tail -n1 | sed 's/Build_iOS_//g')
     echo "${buildNumber}" > build/app/latest.txt
 sftp ${1} <<EOF
     put build/app/Monal.zip /var/www/downloads.monal-im.org/monal-im/$UPLOAD_TYPE/macOS/Monal-${buildNumber}.zip