From d3bb98d38669a81e06f2b5dcf6530afcc3597b61 Mon Sep 17 00:00:00 2001 From: Thilo Molitor Date: Sun, 24 Nov 2024 02:01:12 +0100 Subject: [PATCH 1/3] Revert "Try to fix beta build workflow again" This reverts commit 29ac1793689af14abf55fcf7a92b3d25b2a53012. --- .github/workflows/beta.build-push.yml | 28 +++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/beta.build-push.yml b/.github/workflows/beta.build-push.yml index 7cec78c1e..8d27d1ad8 100644 --- a/.github/workflows/beta.build-push.yml +++ b/.github/workflows/beta.build-push.yml @@ -183,13 +183,13 @@ jobs: echo "$json" | tee /dev/stderr >> "$GITHUB_OUTPUT" echo "__EOF__" | tee /dev/stderr >> "$GITHUB_OUTPUT" - name: Upload ios to appstore connect - run: xcrun altool --upload-app -f ./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: - # #PILOT_LOCALIZED_BUILD_INFO: ${{ steps.buildinfo.outputs.buildinfo_ios }} - # PILOT_LOCALIZED_APP_INFO: ${{ steps.appinfo.outputs.appinfo }} - # PILOT_CHANGELOG: ${{ steps.releasenotes.outputs.notes_ios }} - # run: | - # fastlane run upload_to_testflight api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" ipa:"./Monal/build/ipa/Monal.ipa" skip_submission:true + #run: xcrun altool --upload-app -f ./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: + #PILOT_LOCALIZED_BUILD_INFO: ${{ steps.buildinfo.outputs.buildinfo_ios }} + PILOT_LOCALIZED_APP_INFO: ${{ steps.appinfo.outputs.appinfo }} + PILOT_CHANGELOG: ${{ steps.releasenotes.outputs.notes_ios }} + run: | + fastlane run upload_to_testflight api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" ipa:"./Monal/build/ipa/Monal.ipa" skip_submission:true - name: Publish to ios betatesters #run: xcrun altool --upload-app -f ./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: @@ -223,13 +223,13 @@ jobs: buildNumber: ${{ steps.releasenotes.outputs.buildNumber }} run: ./scripts/uploadNonAlpha.sh - name: Upload 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_LOCALIZED_BUILD_INFO: ${{ steps.buildinfo.outputs.buildinfo_macos }} - # PILOT_LOCALIZED_APP_INFO: ${{ steps.appinfo.outputs.appinfo }} - # 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" skip_submission:true + #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_LOCALIZED_BUILD_INFO: ${{ steps.buildinfo.outputs.buildinfo_macos }} + PILOT_LOCALIZED_APP_INFO: ${{ steps.appinfo.outputs.appinfo }} + 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" skip_submission:true - name: Publish to catalyst betatesters #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: From e99bd71f2510e3cb877a2a3b066b8ee9225dc9aa Mon Sep 17 00:00:00 2001 From: Thilo Molitor Date: Sun, 24 Nov 2024 02:01:22 +0100 Subject: [PATCH 2/3] Revert "Try to fix beta build using our workaround in fastlane issue 28630" This reverts commit 5326d40338646c5bcf9dadc1ebb65390243d64da. --- .github/workflows/beta.build-push.yml | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/.github/workflows/beta.build-push.yml b/.github/workflows/beta.build-push.yml index 8d27d1ad8..3ea31874e 100644 --- a/.github/workflows/beta.build-push.yml +++ b/.github/workflows/beta.build-push.yml @@ -182,22 +182,14 @@ jobs: echo "appinfo<<__EOF__" | tee /dev/stderr >> "$GITHUB_OUTPUT" echo "$json" | tee /dev/stderr >> "$GITHUB_OUTPUT" echo "__EOF__" | tee /dev/stderr >> "$GITHUB_OUTPUT" - - name: Upload ios to appstore connect + - name: Publish ios to appstore connect #run: xcrun altool --upload-app -f ./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: #PILOT_LOCALIZED_BUILD_INFO: ${{ steps.buildinfo.outputs.buildinfo_ios }} PILOT_LOCALIZED_APP_INFO: ${{ steps.appinfo.outputs.appinfo }} PILOT_CHANGELOG: ${{ steps.releasenotes.outputs.notes_ios }} run: | - fastlane run upload_to_testflight api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" ipa:"./Monal/build/ipa/Monal.ipa" skip_submission:true - - name: Publish to ios betatesters - #run: xcrun altool --upload-app -f ./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: - #PILOT_LOCALIZED_BUILD_INFO: ${{ steps.buildinfo.outputs.buildinfo_ios }} - PILOT_LOCALIZED_APP_INFO: ${{ steps.appinfo.outputs.appinfo }} - PILOT_CHANGELOG: ${{ steps.releasenotes.outputs.notes_ios }} - run: | - fastlane run upload_to_testflight api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" app_identifier:G7YU7X7KRJ.SworIM app_platform:ios build_number:${{ steps.releasenotes.outputs.buildNumber }} distribute_only:true distribute_external:true notify_external_testers:true groups:"Internal Pre-Beta Testers","Public Beta" reject_build_waiting_for_review:true submit_beta_review:true + fastlane run upload_to_testflight api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" ipa:"./Monal/build/ipa/Monal.ipa" distribute_external:true notify_external_testers:true groups:"Internal Pre-Beta Testers","Public Beta" reject_build_waiting_for_review:true submit_beta_review:true - name: Notarize catalyst run: xcrun notarytool submit ./Monal/build/app/Monal.zip --wait --team-id S8D843U34Y --key "/Users/ci/appstoreconnect/apiKey.p8" --key-id "$(cat /Users/ci/appstoreconnect/apiKeyId.txt)" --issuer "$(cat /Users/ci/appstoreconnect/apiIssuerId.txt)" - name: staple @@ -222,22 +214,14 @@ jobs: UPLOAD_TYPE: beta buildNumber: ${{ steps.releasenotes.outputs.buildNumber }} run: ./scripts/uploadNonAlpha.sh - - name: Upload 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_LOCALIZED_BUILD_INFO: ${{ steps.buildinfo.outputs.buildinfo_macos }} - PILOT_LOCALIZED_APP_INFO: ${{ steps.appinfo.outputs.appinfo }} - 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" skip_submission:true - - name: Publish to catalyst betatesters + - 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_LOCALIZED_BUILD_INFO: ${{ steps.buildinfo.outputs.buildinfo_macos }} PILOT_LOCALIZED_APP_INFO: ${{ steps.appinfo.outputs.appinfo }} PILOT_CHANGELOG: ${{ steps.releasenotes.outputs.notes_macos }} run: | - fastlane run upload_to_testflight api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" app_identifier:org.monal-im.prod.catalyst.monal app_platform:ios build_number:${{ steps.releasenotes.outputs.buildNumber }} distribute_only:true distribute_external:true notify_external_testers:true groups:"Internal Pre-Beta Testers","Public Beta" reject_build_waiting_for_review:true submit_beta_review:true + 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 notify_external_testers: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: From 9268b2e18985c5139635cf368b1c6bcf03a4a343 Mon Sep 17 00:00:00 2001 From: Thilo Molitor Date: Sun, 24 Nov 2024 01:58:34 +0100 Subject: [PATCH 3/3] Rename arabic appstore translation to use proper language code ar-SA Only language codes listed are supported: https://developermemos.com/posts/supported-ios-language-locale-codes-fastlane --- appstore_metadata/{ar-AE => ar-SA}/description.txt | 0 appstore_metadata/{ar-AE => ar-SA}/keywords.txt | 0 appstore_metadata/{ar-AE => ar-SA}/marketing_url.txt | 0 appstore_metadata/{ar-AE => ar-SA}/privacy_url.txt | 0 appstore_metadata/{ar-AE => ar-SA}/support_url.txt | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename appstore_metadata/{ar-AE => ar-SA}/description.txt (100%) rename appstore_metadata/{ar-AE => ar-SA}/keywords.txt (100%) rename appstore_metadata/{ar-AE => ar-SA}/marketing_url.txt (100%) rename appstore_metadata/{ar-AE => ar-SA}/privacy_url.txt (100%) rename appstore_metadata/{ar-AE => ar-SA}/support_url.txt (100%) diff --git a/appstore_metadata/ar-AE/description.txt b/appstore_metadata/ar-SA/description.txt similarity index 100% rename from appstore_metadata/ar-AE/description.txt rename to appstore_metadata/ar-SA/description.txt diff --git a/appstore_metadata/ar-AE/keywords.txt b/appstore_metadata/ar-SA/keywords.txt similarity index 100% rename from appstore_metadata/ar-AE/keywords.txt rename to appstore_metadata/ar-SA/keywords.txt diff --git a/appstore_metadata/ar-AE/marketing_url.txt b/appstore_metadata/ar-SA/marketing_url.txt similarity index 100% rename from appstore_metadata/ar-AE/marketing_url.txt rename to appstore_metadata/ar-SA/marketing_url.txt diff --git a/appstore_metadata/ar-AE/privacy_url.txt b/appstore_metadata/ar-SA/privacy_url.txt similarity index 100% rename from appstore_metadata/ar-AE/privacy_url.txt rename to appstore_metadata/ar-SA/privacy_url.txt diff --git a/appstore_metadata/ar-AE/support_url.txt b/appstore_metadata/ar-SA/support_url.txt similarity index 100% rename from appstore_metadata/ar-AE/support_url.txt rename to appstore_metadata/ar-SA/support_url.txt