6.4.1-rc5 (#1127)

- Fix stable release script
monal-im · Jul 23, 2024 · c8a9b90 · c8a9b90
2 parents 3b7677a + 95e9dde
commit c8a9b90
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/.github/workflows/publish-stable-release.yml b/.github/workflows/publish-stable-release.yml
@@ -85,7 +85,6 @@ jobs:
         with:
           access-token: ${{ secrets.MASTODON_ACCESS_TOKEN }}
           url: ${{ secrets.MASTODON_URL }}
-
           message: "${{ needs.extractChangelog.outputs.release-name }} released.\n\n${{ steps.changelog.outputs.notes }}\n\n#Monal #ios #macos #xmpp #im #chat #messaging"
           visibility: "public"
           language: "en"

diff --git a/.github/workflows/stable.build-push.yml b/.github/workflows/stable.build-push.yml
@@ -125,15 +125,19 @@ jobs:
       - name: Create fastlane metadata directory
         id: metadata
         env:
-          CHANGELOG: ${{ steps.releasenotes.outputs.notes_ios }}
+          CHANGELOG_IOS: ${{ steps.releasenotes.outputs.notes_ios }}
+          CHANGELOG_MACOS: ${{ steps.releasenotes.outputs.notes_macos }}
         run: |
-          path="$(mktemp -d)"
-          echo -n "$CHANGELOG" > "$path/release_notes.txt"
-          echo "path=$path" | tee /dev/stderr >> "$GITHUB_OUTPUT"
+          path_ios="$(mktemp -d)"
+          echo -n "$CHANGELOG_IOS" > "$path_ios/release_notes.txt"
+          echo "path_ios=$path_ios" | tee /dev/stderr >> "$GITHUB_OUTPUT"
+          path_macos="$(mktemp -d)"
+          echo -n "$CHANGELOG_MACOS" > "$path_macos/release_notes.txt"
+          echo "path_macos=$path_macos" | tee /dev/stderr >> "$GITHUB_OUTPUT"
       - name: Publish ios to appstore connect
         #run: xcrun altool --upload-app --file ./Monal/build/ipa/Monal.ipa --type ios --asc-provider S8D843U34Y --team-id S8D843U34Y -u $(cat /Users/ci/apple_connect_upload_mail.txt) -p "$(cat /Users/ci/apple_connect_upload_secret.txt)"
         env:
-          DELIVER_METADATA_PATH: ${{ steps.metadata.outputs.path }}
+          DELIVER_METADATA_PATH: ${{ steps.metadata.outputs.path_ios }}
         run: |
           fastlane run upload_to_app_store api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" ipa:"./Monal/build/ipa/Monal.ipa" app_version:"${{ steps.releasenotes.outputs.version }}" reject_if_possible:true submit_for_review:true automatic_release:true skip_metadata: true skip_screenshots: true
       - name: Notarize catalyst
@@ -160,14 +164,15 @@ jobs:
       - 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:
-          DELIVER_METADATA_PATH: ${{ steps.metadata.outputs.path }}
+          DELIVER_METADATA_PATH: ${{ steps.metadata.outputs.path_macos }}
         run: |
           fastlane run upload_to_app_store api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" pkg:"./Monal/build/app/Monal.pkg" app_version:"${{ steps.releasenotes.outputs.version }}" reject_if_possible:true submit_for_review:true automatic_release:true skip_metadata: true skip_screenshots: true
       # - name: Update xmpp.org client list with new timestamp
       #   run: ./scripts/push_xmpp.org.sh
       - name: Remove fastlane metadata directory
         run: |
-          rm -rf "${{ steps.metadata.outputs.path }}"
+          rm -rf "${{ steps.metadata.outputs.path_ios }}"
+          rm -rf "${{ steps.metadata.outputs.path_macos }}"
       - name: Create Draft Release
         id: draftrelease
         uses: softprops/action-gh-release@v2

diff --git a/Monal/Classes/MLFiletransfer.m b/Monal/Classes/MLFiletransfer.m
@@ -623,8 +623,17 @@ +(MLHandler*) prepareUIImageUpload:(UIImage*) image
     NSString* tempname = [NSString stringWithFormat:@"tmp.%@", [[NSUUID UUID] UUIDString]];
     NSError* error;
     NSString* file = [_documentCacheDir stringByAppendingPathComponent:tempname];
-    DDLogDebug(@"Tempstoring jpeg encoded file having quality %f at %@", imageQuality, file);
-    NSData* imageData = UIImageJPEGRepresentation(image, imageQuality);
+    NSData* imageData = nil;
+    if(imageQuality == 1.0)
+    {
+        DDLogDebug(@"Image upload quality was set to 100%%, tempstoring png encoded file at %@", file);
+        imageData = UIImagePNGRepresentation(image);
+    }
+    else
+    {
+        DDLogDebug(@"Tempstoring jpeg encoded file having quality %f at %@", imageQuality, file);
+        imageData = UIImageJPEGRepresentation(image, imageQuality);
+    }
     [imageData writeToFile:file options:NSDataWritingAtomic error:&error];
     if(error)
     {