From 7118cca2cdf98209865640ab9e2e10f211d0c822 Mon Sep 17 00:00:00 2001
From: Thilo Molitor <thilo@monal-im.org>
Date: Mon, 23 Dec 2024 00:18:20 +0100
Subject: [PATCH] Strip off < and > signs in changelog to make apple happy

---
 .github/workflows/beta.build-push.yml    | 7 +++++--
 .github/workflows/quicksy.build-push.yml | 7 +++++--
 .github/workflows/stable.build-push.yml  | 7 +++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/beta.build-push.yml b/.github/workflows/beta.build-push.yml
index 3ea31874e..a8c8ed4d2 100644
--- a/.github/workflows/beta.build-push.yml
+++ b/.github/workflows/beta.build-push.yml
@@ -71,6 +71,9 @@ jobs:
                   printf("\n")
               }'
           }
+          function replace_unwanted_chars {
+            sed -e 's/>=/greater or equal than/g' -e 's/<=/lower or equal than/g' -e 's/>/greater than/g' -e 's/</lower than/g')
+          }
           buildNumber="$(git tag --sort="v:refname" | grep "Build_iOS" | grep -v "Quicksy_Build_iOS" | tail -n1 | sed 's/Build_iOS_//g')"
           version="$(git log -n 1 --merges --pretty=format:%s | sed -E 's/^[\t\n ]*([^\n\t ]+)[\t\n ]+\(([^\n\t ]+)\)[\t\n ]*$/\1/g')"
           mkdir -p /Users/ci/releases
@@ -90,11 +93,11 @@ jobs:
           echo "__EOF__" | tee /dev/stderr >> "$OUTPUT_FILE"
           
           echo "notes_ios<<__EOF__" | tee /dev/stderr >> "$OUTPUT_FILE"
-          echo "$(git log -n 1 --merges --pretty=format:%b)" | repairNotes | grep -v '^[\t\n ]*MACOS_ONLY.*$' | sed -E 's/^[\t\n ]*IOS_ONLY[\t\n ]?(.*)$/\1/g' | tee /dev/stderr >> "$OUTPUT_FILE"
+          echo "$(git log -n 1 --merges --pretty=format:%b)" | repairNotes | grep -v '^[\t\n ]*MACOS_ONLY.*$' | sed -E 's/^[\t\n ]*IOS_ONLY[\t\n ]?(.*)$/\1/g' | replace_unwanted_chars | tee /dev/stderr >> "$OUTPUT_FILE"
           echo "__EOF__" | tee /dev/stderr >> "$OUTPUT_FILE"
           
           echo "notes_macos<<__EOF__" | tee /dev/stderr >> "$OUTPUT_FILE"
-          echo "$(git log -n 1 --merges --pretty=format:%b)" | repairNotes | grep -v '^[\t\n ]*IOS_ONLY.*$' | sed -E 's/^[\t\n ]*MACOS_ONLY[\t\n ]?(.*)$/\1/g' | tee /dev/stderr >> "$OUTPUT_FILE"
+          echo "$(git log -n 1 --merges --pretty=format:%b)" | repairNotes | grep -v '^[\t\n ]*IOS_ONLY.*$' | sed -E 's/^[\t\n ]*MACOS_ONLY[\t\n ]?(.*)$/\1/g' | replace_unwanted_chars | tee /dev/stderr >> "$OUTPUT_FILE"
           echo "__EOF__" | tee /dev/stderr >> "$OUTPUT_FILE"
           
           cat "$OUTPUT_FILE" >> "$GITHUB_OUTPUT"
diff --git a/.github/workflows/quicksy.build-push.yml b/.github/workflows/quicksy.build-push.yml
index 80301f89c..dec259df8 100644
--- a/.github/workflows/quicksy.build-push.yml
+++ b/.github/workflows/quicksy.build-push.yml
@@ -69,6 +69,9 @@ jobs:
                   printf("\n")
               }'
           }
+          function replace_unwanted_chars {
+            sed -e 's/>=/greater or equal than/g' -e 's/<=/lower or equal than/g' -e 's/>/greater than/g' -e 's/</lower than/g')
+          }
           buildNumber="$(git tag --sort="v:refname" | grep "Quicksy_Build_iOS" | tail -n1 | sed 's/Quicksy_Build_iOS_//g')"
           version="$(git log -n 1 --merges --pretty=format:%s | sed -E 's/^[\t\n ]*([^\n\t ]+)[\t\n ]+\(([^\n\t ]+)\)[\t\n ]*$/\1/g')"
           if [ "${{ github.ref }}" != "refs/heads/stable" ]; then
@@ -91,11 +94,11 @@ jobs:
           echo "__EOF__" | tee /dev/stderr >> "$OUTPUT_FILE"
           
           echo "notes_ios<<__EOF__" | tee /dev/stderr >> "$OUTPUT_FILE"
-          echo "$(git log -n 1 --merges --pretty=format:%b)" | repairNotes | grep -v '^[\t\n ]*MACOS_ONLY.*$' | sed -E 's/^[\t\n ]*IOS_ONLY[\t\n ]?(.*)$/\1/g' | tee /dev/stderr >> "$OUTPUT_FILE"
+          echo "$(git log -n 1 --merges --pretty=format:%b)" | repairNotes | grep -v '^[\t\n ]*MACOS_ONLY.*$' | sed -E 's/^[\t\n ]*IOS_ONLY[\t\n ]?(.*)$/\1/g' | replace_unwanted_chars | tee /dev/stderr >> "$OUTPUT_FILE"
           echo "__EOF__" | tee /dev/stderr >> "$OUTPUT_FILE"
           
           echo "notes_macos<<__EOF__" | tee /dev/stderr >> "$OUTPUT_FILE"
-          echo "$(git log -n 1 --merges --pretty=format:%b)" | repairNotes | grep -v '^[\t\n ]*IOS_ONLY.*$' | sed -E 's/^[\t\n ]*MACOS_ONLY[\t\n ]?(.*)$/\1/g' | tee /dev/stderr >> "$OUTPUT_FILE"
+          echo "$(git log -n 1 --merges --pretty=format:%b)" | repairNotes | grep -v '^[\t\n ]*IOS_ONLY.*$' | sed -E 's/^[\t\n ]*MACOS_ONLY[\t\n ]?(.*)$/\1/g' | replace_unwanted_chars | tee /dev/stderr >> "$OUTPUT_FILE"
           echo "__EOF__" | tee /dev/stderr >> "$OUTPUT_FILE"
           
           cat "$OUTPUT_FILE" >> "$GITHUB_OUTPUT"
diff --git a/.github/workflows/stable.build-push.yml b/.github/workflows/stable.build-push.yml
index 93cb4603c..f833dfa9b 100644
--- a/.github/workflows/stable.build-push.yml
+++ b/.github/workflows/stable.build-push.yml
@@ -67,6 +67,9 @@ jobs:
                   printf("\n")
               }'
           }
+          function replace_unwanted_chars {
+            sed -e 's/>=/greater or equal than/g' -e 's/<=/lower or equal than/g' -e 's/>/greater than/g' -e 's/</lower than/g')
+          }
           buildNumber="$(git tag --sort="v:refname" | grep "Build_iOS" | grep -v "Quicksy_Build_iOS" | tail -n1 | sed 's/Build_iOS_//g')"
           version="$(git log -n 1 --merges --pretty=format:%s | sed -E 's/^[\t\n ]*([^\n\t ]+)[\t\n ]+\(([^\n\t ]+)\)[\t\n ]*$/\1/g')"
           mkdir -p /Users/ci/releases
@@ -86,11 +89,11 @@ jobs:
           echo "__EOF__" | tee /dev/stderr >> "$OUTPUT_FILE"
           
           echo "notes_ios<<__EOF__" | tee /dev/stderr >> "$OUTPUT_FILE"
-          echo "$(git log -n 1 --merges --pretty=format:%b)" | repairNotes | grep -v '^[\t\n ]*MACOS_ONLY.*$' | sed -E 's/^[\t\n ]*IOS_ONLY[\t\n ]?(.*)$/\1/g' | tee /dev/stderr >> "$OUTPUT_FILE"
+          echo "$(git log -n 1 --merges --pretty=format:%b)" | repairNotes | grep -v '^[\t\n ]*MACOS_ONLY.*$' | sed -E 's/^[\t\n ]*IOS_ONLY[\t\n ]?(.*)$/\1/g' | replace_unwanted_chars | tee /dev/stderr >> "$OUTPUT_FILE"
           echo "__EOF__" | tee /dev/stderr >> "$OUTPUT_FILE"
           
           echo "notes_macos<<__EOF__" | tee /dev/stderr >> "$OUTPUT_FILE"
-          echo "$(git log -n 1 --merges --pretty=format:%b)" | repairNotes | grep -v '^[\t\n ]*IOS_ONLY.*$' | sed -E 's/^[\t\n ]*MACOS_ONLY[\t\n ]?(.*)$/\1/g' | tee /dev/stderr >> "$OUTPUT_FILE"
+          echo "$(git log -n 1 --merges --pretty=format:%b)" | repairNotes | grep -v '^[\t\n ]*IOS_ONLY.*$' | sed -E 's/^[\t\n ]*MACOS_ONLY[\t\n ]?(.*)$/\1/g' | replace_unwanted_chars | tee /dev/stderr >> "$OUTPUT_FILE"
           echo "__EOF__" | tee /dev/stderr >> "$OUTPUT_FILE"
           
           cat "$OUTPUT_FILE" >> "$GITHUB_OUTPUT"