From 4017cd8de57cb14717b88320162785fe9d286c77 Mon Sep 17 00:00:00 2001 From: Thilo Molitor Date: Fri, 2 Aug 2024 05:33:02 +0200 Subject: [PATCH] Fix quicksy build --- .github/workflows/quicksy.build-push.yml | 11 +++++------ appstore_quicksy_metadata/en-US/description.txt | 5 +++++ appstore_quicksy_metadata/en-US/keywords.txt | 1 + appstore_quicksy_metadata/en-US/marketing_url.txt | 1 + appstore_quicksy_metadata/en-US/privacy_url.txt | 1 + appstore_quicksy_metadata/en-US/support_url.txt | 1 + scripts/build.sh | 2 +- 7 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 appstore_quicksy_metadata/en-US/description.txt create mode 100644 appstore_quicksy_metadata/en-US/keywords.txt create mode 100644 appstore_quicksy_metadata/en-US/marketing_url.txt create mode 100644 appstore_quicksy_metadata/en-US/privacy_url.txt create mode 100644 appstore_quicksy_metadata/en-US/support_url.txt diff --git a/.github/workflows/quicksy.build-push.yml b/.github/workflows/quicksy.build-push.yml index 3342dee47a..1d050ae46f 100644 --- a/.github/workflows/quicksy.build-push.yml +++ b/.github/workflows/quicksy.build-push.yml @@ -18,8 +18,7 @@ jobs: env: APP_NAME: "Quicksy" BUILD_SCHEME: "Quicksy" - APP_DIR: "Monal.app" - BUILD_TYPE: "AppStore" + BUILD_TYPE: "AppStore-Quicksy" EXPORT_OPTIONS_IOS: "../scripts/exportOptions/Quicksy_Stable_iOS_ExportOptions.plist" # Steps represent a sequence of tasks that will be executed as part of the job steps: @@ -103,7 +102,7 @@ jobs: - uses: actions/upload-artifact@v4 with: name: monal-ios - path: Monal/build/ipa/Monal.ipa + path: Monal/build/ipa/Quicksy.ipa if-no-files-found: error # - uses: actions/upload-artifact@v4 # with: @@ -111,7 +110,7 @@ jobs: # 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)" + run: xcrun altool --validate-app --file ./Monal/build/ipa/Quicksy.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 run: | buildNumber=$(git tag --sort="v:refname" | grep "Quicksy_Build_iOS" | tail -n1 | sed 's/Quicksy_Build_iOS_//g') @@ -132,11 +131,11 @@ jobs: done echo "path_ios=$path_ios" | 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)" + #run: xcrun altool --upload-app --file ./Monal/build/ipa/Quicksy.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_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 }}" platform:ios reject_if_possible:true submit_for_review:true automatic_release:true skip_metadata:false skip_screenshots:true precheck_include_in_app_purchases:false version_check_wait_retry_limit:10 force:true + fastlane run upload_to_app_store api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" ipa:"./Monal/build/ipa/Quicksy.ipa" app_version:"${{ steps.releasenotes.outputs.version }}" platform:ios reject_if_possible:true submit_for_review:true automatic_release:true skip_metadata:false skip_screenshots:true precheck_include_in_app_purchases:false version_check_wait_retry_limit:10 force:true - name: Remove fastlane metadata directory run: | rm -rf "${{ steps.metadata.outputs.path }}" diff --git a/appstore_quicksy_metadata/en-US/description.txt b/appstore_quicksy_metadata/en-US/description.txt new file mode 100644 index 0000000000..a9a9ba9455 --- /dev/null +++ b/appstore_quicksy_metadata/en-US/description.txt @@ -0,0 +1,5 @@ +Quicksy is a spin off of the popular XMPP client Monal with automatic contact discovery. + +You sign up with your phone number and Quicksy will automatically — based on the phone numbers in your address book — suggest possible contacts to you. Under the hood Quicksy is a full-fledged XMPP client that lets you communicate with any user on any publicly federating server. Likewise users on Quicksy can be contacted from the outside simply by adding +phonenumber@quicksy.im to your contact list. + +Aside from the contact sync the user interface is deliberately as close to Monal as possible. This allows users to eventually migrate from Quicksy to Monal without having to relearn how the app works. \ No newline at end of file diff --git a/appstore_quicksy_metadata/en-US/keywords.txt b/appstore_quicksy_metadata/en-US/keywords.txt new file mode 100644 index 0000000000..cc2016d901 --- /dev/null +++ b/appstore_quicksy_metadata/en-US/keywords.txt @@ -0,0 +1 @@ +xmpp, jabber, chat, instant messaging, messaging, ejabberd, prosody, OMEMO \ No newline at end of file diff --git a/appstore_quicksy_metadata/en-US/marketing_url.txt b/appstore_quicksy_metadata/en-US/marketing_url.txt new file mode 100644 index 0000000000..b53627eba2 --- /dev/null +++ b/appstore_quicksy_metadata/en-US/marketing_url.txt @@ -0,0 +1 @@ +https://quicksy.im/ \ No newline at end of file diff --git a/appstore_quicksy_metadata/en-US/privacy_url.txt b/appstore_quicksy_metadata/en-US/privacy_url.txt new file mode 100644 index 0000000000..bb7d1c0a62 --- /dev/null +++ b/appstore_quicksy_metadata/en-US/privacy_url.txt @@ -0,0 +1 @@ +https://quicksy.im/privacy.htm \ No newline at end of file diff --git a/appstore_quicksy_metadata/en-US/support_url.txt b/appstore_quicksy_metadata/en-US/support_url.txt new file mode 100644 index 0000000000..b53627eba2 --- /dev/null +++ b/appstore_quicksy_metadata/en-US/support_url.txt @@ -0,0 +1 @@ +https://quicksy.im/ \ No newline at end of file diff --git a/scripts/build.sh b/scripts/build.sh index d0b31bdf3e..b89ca6517a 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -122,4 +122,4 @@ xcodebuild \ -allowProvisioningDeviceRegistration echo "build dir:" -ls -l "build" +find build