6.4.1-rc3 (#1124)

- Fix message doubling when editing in a channel (LMC) - Fix own messages in public channels erroneously having a lock icon despite not being encrypted - Show contact requests menu when tapping onto a contact request notification - Wrap onboarding titles properly on small screens - Improve contact requests UI and show which account a request belongs to
monal-im · Jul 22, 2024 · 9e2c27b · 9e2c27b
2 parents e83c387 + d0c68f9
commit 9e2c27b
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 65 deletions.
diff --git a/.github/workflows/beta.build-push.yml b/.github/workflows/beta.build-push.yml
@@ -105,6 +105,21 @@ jobs:
         run: chmod +x ./scripts/build.sh
       - name: Run build
         run: ./scripts/build.sh
+      - uses: actions/upload-artifact@v4
+        with:
+          name: monal-ios
+          path: Monal/build/ipa/Monal.ipa
+          if-no-files-found: error
+      - uses: actions/upload-artifact@v4
+        with:
+          name: monal-catalyst-dsym
+          path: Monal/build/macos_Monal.xcarchive/dSYMs
+          if-no-files-found: error
+      - uses: actions/upload-artifact@v4
+        with:
+          name: monal-ios-dsym
+          path: Monal/build/ios_Monal.xcarchive/dSYMs
+          if-no-files-found: error
       - name: validate ios app
         run: xcrun altool --validate-app --file ./Monal/build/ipa/Monal.ipa --type ios --asc-provider S8D843U34Y -u "$(cat /Users/ci/apple_connect_upload_mail.txt)" -p "$(cat /Users/ci/apple_connect_upload_secret.txt)"
       - name: Push beta tag to repo
@@ -126,14 +141,6 @@ jobs:
           stapler validate "$APP_DIR"
           /usr/bin/ditto -c -k --sequesterRsrc --keepParent "$APP_DIR" "../$APP_NAME.zip"
           cd ../../../..
-      - name: Upload new catalyst beta to monal-im.org
-        run: ./scripts/uploadNonAlpha.sh beta
-      - 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:
-          PILOT_CHANGELOG: ${{ steps.releasenotes.outputs.notes_macos }}
-        run: |
-          fastlane run upload_to_testflight api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" pkg:"./Monal/build/app/Monal.pkg" distribute_external:true groups:"Internal Pre-Beta Testers","Public Beta" reject_build_waiting_for_review:true submit_beta_review:true
       - uses: actions/upload-artifact@v4
         with:
           name: monal-catalyst-zip
@@ -144,21 +151,14 @@ jobs:
           name: monal-catalyst-pkg
           path: Monal/build/app/Monal.pkg
           if-no-files-found: error
-      - uses: actions/upload-artifact@v4
-        with:
-          name: monal-ios
-          path: Monal/build/ipa/Monal.ipa
-          if-no-files-found: error
-      - uses: actions/upload-artifact@v4
-        with:
-          name: monal-catalyst-dsym
-          path: Monal/build/macos_Monal.xcarchive/dSYMs
-          if-no-files-found: error
-      - uses: actions/upload-artifact@v4
-        with:
-          name: monal-ios-dsym
-          path: Monal/build/ios_Monal.xcarchive/dSYMs
-          if-no-files-found: error
+      - name: Upload new catalyst beta to monal-im.org
+        run: ./scripts/uploadNonAlpha.sh beta
+      - 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:
+          PILOT_CHANGELOG: ${{ steps.releasenotes.outputs.notes_macos }}
+        run: |
+          fastlane run upload_to_testflight api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" pkg:"./Monal/build/app/Monal.pkg" distribute_external:true groups:"Internal Pre-Beta Testers","Public Beta" reject_build_waiting_for_review:true submit_beta_review:true
       - name: Release
         uses: softprops/action-gh-release@v2
         with:

diff --git a/.github/workflows/quicksy.build-push.yml b/.github/workflows/quicksy.build-push.yml
@@ -5,7 +5,7 @@ name: quicksy.build-push
 on:
   # Triggers the workflow on push
   push:
-    branches: [ quicksy ]
+    branches: [ stable ]
 
   workflow_dispatch:
 
@@ -99,6 +99,16 @@ jobs:
         run: chmod +x ./scripts/build.sh
       - name: Run build
         run: ./scripts/build.sh
+      - uses: actions/upload-artifact@v4
+        with:
+          name: monal-ios
+          path: Monal/build/ipa/Monal.ipa
+          if-no-files-found: error
+      # - uses: actions/upload-artifact@v4
+      #   with:
+      #     name: monal-ios-dsym
+      #     path: Monal/build/ios_Monal.xcarchive/dSYMs
+      #     if-no-files-found: error
       - name: validate ios app
         run: xcrun altool --validate-app --file ./Monal/build/ipa/Monal.ipa --type ios -u $(cat /Users/ci/apple_connect_upload_mail.txt) -p "$(cat /Users/ci/apple_connect_upload_secret.txt)"
       - name: push tag to stable repo
@@ -118,17 +128,7 @@ jobs:
         env:
           DELIVER_METADATA_PATH: ${{ steps.metadata.outputs.path }}
         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
+          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:false automatic_release:false skip_metadata: true skip_screenshots: true
       - name: Remove fastlane metadata directory
         run: |
           rm -rf "${{ steps.metadata.outputs.path }}"
-      - uses: actions/upload-artifact@v4
-        with:
-          name: monal-ios
-          path: Monal/build/ipa/Monal.ipa
-          if-no-files-found: error
-      # - uses: actions/upload-artifact@v4
-      #   with:
-      #     name: monal-ios-dsym
-      #     path: Monal/build/ios_Monal.xcarchive/dSYMs
-      #     if-no-files-found: error
diff --git a/.github/workflows/stable.build-push.yml b/.github/workflows/stable.build-push.yml
@@ -99,9 +99,23 @@ jobs:
           fi
       - name: Make our build scripts executable
         run: chmod +x ./scripts/build.sh
-      - run: chmod +x ./scripts/push_xmpp.org.sh
       - name: Run build
         run: ./scripts/build.sh
+      - uses: actions/upload-artifact@v4
+        with:
+          name: monal-ios
+          path: Monal/build/ipa/Monal.ipa
+          if-no-files-found: error
+      # - uses: actions/upload-artifact@v4
+      #   with:
+      #     name: monal-catalyst-dsym
+      #     path: Monal/build/macos_Monal.xcarchive/dSYMs
+      #     if-no-files-found: error
+      # - uses: actions/upload-artifact@v4
+      #   with:
+      #     name: monal-ios-dsym
+      #     path: Monal/build/ios_Monal.xcarchive/dSYMs
+      #     if-no-files-found: error
       - name: validate ios app
         run: xcrun altool --validate-app --file ./Monal/build/ipa/Monal.ipa --type ios -u $(cat /Users/ci/apple_connect_upload_mail.txt) -p "$(cat /Users/ci/apple_connect_upload_secret.txt)"
       - name: push tag to stable repo
@@ -131,6 +145,16 @@ jobs:
           stapler validate "$APP_DIR"
           /usr/bin/ditto -c -k --sequesterRsrc --keepParent "$APP_DIR" "../$APP_NAME.zip"
           cd ../../../..
+      - uses: actions/upload-artifact@v4
+        with:
+          name: monal-catalyst-zip
+          path: Monal/build/app/Monal.zip
+          if-no-files-found: error
+      - uses: actions/upload-artifact@v4
+        with:
+          name: monal-catalyst-pkg
+          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
       - name: Publish catalyst to appstore connect
@@ -144,31 +168,6 @@ jobs:
       - name: Remove fastlane metadata directory
         run: |
           rm -rf "${{ steps.metadata.outputs.path }}"
-      - uses: actions/upload-artifact@v4
-        with:
-          name: monal-catalyst-zip
-          path: Monal/build/app/Monal.zip
-          if-no-files-found: error
-      - uses: actions/upload-artifact@v4
-        with:
-          name: monal-catalyst-pkg
-          path: Monal/build/app/Monal.pkg
-          if-no-files-found: error
-      - uses: actions/upload-artifact@v4
-        with:
-          name: monal-ios
-          path: Monal/build/ipa/Monal.ipa
-          if-no-files-found: error
-      # - uses: actions/upload-artifact@v4
-      #   with:
-      #     name: monal-catalyst-dsym
-      #     path: Monal/build/macos_Monal.xcarchive/dSYMs
-      #     if-no-files-found: error
-      # - uses: actions/upload-artifact@v4
-      #   with:
-      #     name: monal-ios-dsym
-      #     path: Monal/build/ios_Monal.xcarchive/dSYMs
-      #     if-no-files-found: error
       - name: Create Draft Release
         id: draftrelease
         uses: softprops/action-gh-release@v2

diff --git a/scripts/set_version_number.sh b/scripts/set_version_number.sh
@@ -2,16 +2,19 @@
 
 # Abort on Error
 set -e
+set -x
 
 cd Monal
 
 echo ""
-echo "*******************************************"
-echo "*     Setting buildNumber to $buildNumber *"
-echo "*******************************************"
+echo "***************************************************"
+echo "* Setting buildNumber to $buildNumber and version to $version *"
+echo "***************************************************"
 
 /usr/libexec/PlistBuddy -c "Set :CFBundleVersion $buildNumber" "NotificationService/Info.plist"
 /usr/libexec/PlistBuddy -c "Set :CFBundleVersion $buildNumber" "shareSheet-iOS/Info.plist"
 /usr/libexec/PlistBuddy -c "Set :CFBundleVersion $buildNumber" "$APP_NAME-Info.plist"
 
-/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString $version" "$APP_NAME-Info.plist"
+/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString $version" "NotificationService/Info.plist"
+/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString $version" "shareSheet-iOS/Info.plist"
+/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString $version" "$APP_NAME-Info.plist"