From 32f7e72214d8091342cea5e2092e8561ba4d27e2 Mon Sep 17 00:00:00 2001 From: Ian Maia Date: Thu, 31 Oct 2024 00:38:46 +0100 Subject: [PATCH 1/6] Call `use-bot-for-git` script directly --- .buildkite/commands/configure-for-release.sh | 21 ------------------- .../complete-code-freeze.yml | 3 ++- .../release-pipelines/finalize-release.yml | 3 ++- .../release-pipelines/new-beta-release.yml | 3 ++- .../release-pipelines/publish-release.yml | 3 ++- .../release-pipelines/start-code-freeze.yml | 3 ++- .../update-metadata-on-app-store-connect.yml | 3 ++- 7 files changed, 12 insertions(+), 27 deletions(-) delete mode 100755 .buildkite/commands/configure-for-release.sh diff --git a/.buildkite/commands/configure-for-release.sh b/.buildkite/commands/configure-for-release.sh deleted file mode 100755 index 59ba15d49..000000000 --- a/.buildkite/commands/configure-for-release.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then - echo "This script must be 'source'd (instead of being called directly as an executable) to work properly" - exit 1 -fi - -# Note: Set the flags separately (instead of via the shebang), because that script will be `source`'d and not run directly -set -e -set -u - -echo '--- :git: Configure Git for Release Management' - -# The Git command line client is not configured in Buildkite. -# At the moment, steps that need Git access can configure it on demand using this script. -# Later on, we should be able to configure it on the agent instead. -git config --global user.email "mobile+wpmobilebot@automattic.com" -git config --global user.name "Automattic Release Bot" - -echo '--- :robot_face: Use bot for git operations' -source use-bot-for-git diff --git a/.buildkite/release-pipelines/complete-code-freeze.yml b/.buildkite/release-pipelines/complete-code-freeze.yml index 34cca6993..14fd74c7d 100644 --- a/.buildkite/release-pipelines/complete-code-freeze.yml +++ b/.buildkite/release-pipelines/complete-code-freeze.yml @@ -15,7 +15,8 @@ steps: key: complete_code_freeze plugins: [$CI_TOOLKIT_PLUGIN] command: | - source .buildkite/commands/configure-for-release.sh + echo '--- :robot_face: Use bot for git operations' + source use-bot-for-git .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION" diff --git a/.buildkite/release-pipelines/finalize-release.yml b/.buildkite/release-pipelines/finalize-release.yml index e4b565077..0fbf6e481 100644 --- a/.buildkite/release-pipelines/finalize-release.yml +++ b/.buildkite/release-pipelines/finalize-release.yml @@ -13,7 +13,8 @@ steps: - label: Finalize Release plugins: [$CI_TOOLKIT_PLUGIN] command: | - source .buildkite/commands/configure-for-release.sh + echo '--- :robot_face: Use bot for git operations' + source use-bot-for-git .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION" diff --git a/.buildkite/release-pipelines/new-beta-release.yml b/.buildkite/release-pipelines/new-beta-release.yml index 325e8c0a3..b69882391 100644 --- a/.buildkite/release-pipelines/new-beta-release.yml +++ b/.buildkite/release-pipelines/new-beta-release.yml @@ -17,7 +17,8 @@ steps: - label: New Beta Release plugins: [$CI_TOOLKIT_PLUGIN] command: | - source .buildkite/commands/configure-for-release.sh + echo '--- :robot_face: Use bot for git operations' + source use-bot-for-git .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION" diff --git a/.buildkite/release-pipelines/publish-release.yml b/.buildkite/release-pipelines/publish-release.yml index 7da8748b5..310e54d24 100644 --- a/.buildkite/release-pipelines/publish-release.yml +++ b/.buildkite/release-pipelines/publish-release.yml @@ -13,7 +13,8 @@ steps: - label: Publish Release plugins: [$CI_TOOLKIT_PLUGIN] command: | - source .buildkite/commands/configure-for-release.sh + echo '--- :robot_face: Use bot for git operations' + source use-bot-for-git .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION" diff --git a/.buildkite/release-pipelines/start-code-freeze.yml b/.buildkite/release-pipelines/start-code-freeze.yml index e8bbf561a..8c1e1311d 100644 --- a/.buildkite/release-pipelines/start-code-freeze.yml +++ b/.buildkite/release-pipelines/start-code-freeze.yml @@ -14,7 +14,8 @@ steps: plugins: - $CI_TOOLKIT_PLUGIN command: | - source .buildkite/commands/configure-for-release.sh + echo '--- :robot_face: Use bot for git operations' + source use-bot-for-git echo '--- :ruby: Setup Ruby Tools' install_gems diff --git a/.buildkite/release-pipelines/update-metadata-on-app-store-connect.yml b/.buildkite/release-pipelines/update-metadata-on-app-store-connect.yml index 25d2e1c5c..4e23425b4 100644 --- a/.buildkite/release-pipelines/update-metadata-on-app-store-connect.yml +++ b/.buildkite/release-pipelines/update-metadata-on-app-store-connect.yml @@ -13,7 +13,8 @@ steps: - label: Finalize Release plugins: [$CI_TOOLKIT_PLUGIN] command: | - source .buildkite/commands/configure-for-release.sh + echo '--- :robot_face: Use bot for git operations' + source use-bot-for-git .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION" From 91e5ced34a4e36ca0dd6bdad0aaf47b8c90fd71a Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Thu, 31 Oct 2024 11:45:50 +1100 Subject: [PATCH 2/6] `s/for git/for Git/` --- .buildkite/release-pipelines/complete-code-freeze.yml | 2 +- .buildkite/release-pipelines/finalize-release.yml | 2 +- .buildkite/release-pipelines/new-beta-release.yml | 2 +- .buildkite/release-pipelines/publish-release.yml | 2 +- .buildkite/release-pipelines/start-code-freeze.yml | 2 +- .../release-pipelines/update-metadata-on-app-store-connect.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.buildkite/release-pipelines/complete-code-freeze.yml b/.buildkite/release-pipelines/complete-code-freeze.yml index 14fd74c7d..e50946847 100644 --- a/.buildkite/release-pipelines/complete-code-freeze.yml +++ b/.buildkite/release-pipelines/complete-code-freeze.yml @@ -15,7 +15,7 @@ steps: key: complete_code_freeze plugins: [$CI_TOOLKIT_PLUGIN] command: | - echo '--- :robot_face: Use bot for git operations' + echo '--- :robot_face: Use bot for Git operations' source use-bot-for-git .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION" diff --git a/.buildkite/release-pipelines/finalize-release.yml b/.buildkite/release-pipelines/finalize-release.yml index 0fbf6e481..5f6f1deae 100644 --- a/.buildkite/release-pipelines/finalize-release.yml +++ b/.buildkite/release-pipelines/finalize-release.yml @@ -13,7 +13,7 @@ steps: - label: Finalize Release plugins: [$CI_TOOLKIT_PLUGIN] command: | - echo '--- :robot_face: Use bot for git operations' + echo '--- :robot_face: Use bot for Git operations' source use-bot-for-git .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION" diff --git a/.buildkite/release-pipelines/new-beta-release.yml b/.buildkite/release-pipelines/new-beta-release.yml index b69882391..84c1a8de7 100644 --- a/.buildkite/release-pipelines/new-beta-release.yml +++ b/.buildkite/release-pipelines/new-beta-release.yml @@ -17,7 +17,7 @@ steps: - label: New Beta Release plugins: [$CI_TOOLKIT_PLUGIN] command: | - echo '--- :robot_face: Use bot for git operations' + echo '--- :robot_face: Use bot for Git operations' source use-bot-for-git .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION" diff --git a/.buildkite/release-pipelines/publish-release.yml b/.buildkite/release-pipelines/publish-release.yml index 310e54d24..964c91cbf 100644 --- a/.buildkite/release-pipelines/publish-release.yml +++ b/.buildkite/release-pipelines/publish-release.yml @@ -13,7 +13,7 @@ steps: - label: Publish Release plugins: [$CI_TOOLKIT_PLUGIN] command: | - echo '--- :robot_face: Use bot for git operations' + echo '--- :robot_face: Use bot for Git operations' source use-bot-for-git .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION" diff --git a/.buildkite/release-pipelines/start-code-freeze.yml b/.buildkite/release-pipelines/start-code-freeze.yml index 8c1e1311d..8de7affef 100644 --- a/.buildkite/release-pipelines/start-code-freeze.yml +++ b/.buildkite/release-pipelines/start-code-freeze.yml @@ -14,7 +14,7 @@ steps: plugins: - $CI_TOOLKIT_PLUGIN command: | - echo '--- :robot_face: Use bot for git operations' + echo '--- :robot_face: Use bot for Git operations' source use-bot-for-git echo '--- :ruby: Setup Ruby Tools' diff --git a/.buildkite/release-pipelines/update-metadata-on-app-store-connect.yml b/.buildkite/release-pipelines/update-metadata-on-app-store-connect.yml index 4e23425b4..94273bce7 100644 --- a/.buildkite/release-pipelines/update-metadata-on-app-store-connect.yml +++ b/.buildkite/release-pipelines/update-metadata-on-app-store-connect.yml @@ -13,7 +13,7 @@ steps: - label: Finalize Release plugins: [$CI_TOOLKIT_PLUGIN] command: | - echo '--- :robot_face: Use bot for git operations' + echo '--- :robot_face: Use bot for Git operations' source use-bot-for-git .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION" From 7024636dc0753d2ca6fa29dd4c78f76387d9d595 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Sat, 2 Nov 2024 08:01:42 +1100 Subject: [PATCH 3/6] Fix version file path in `release_is_hotfix?` helper --- fastlane/lanes/release.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb index 73634b536..7ae5231ed 100644 --- a/fastlane/lanes/release.rb +++ b/fastlane/lanes/release.rb @@ -419,6 +419,6 @@ def delete_all_metadata_release_notes(store_metadata_folder: STORE_METADATA_FOLD def release_is_hotfix? VERSION_CALCULATOR.release_is_hotfix?( - version: VERSION_FORMATTER.parse(VERSION_FILE.read_release_version) + version: VERSION_FORMATTER.parse(PUBLIC_VERSION_FILE.read_release_version) ) end From d87e024630423b3c3bdb60f1ce319f1485d7a143 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Sat, 2 Nov 2024 08:07:26 +1100 Subject: [PATCH 4/6] Update App Store metadata translations --- fastlane/metadata/ar-SA/keywords.txt | 2 +- fastlane/metadata/es-ES/release_notes.txt | 3 +++ fastlane/metadata/fr-FR/release_notes.txt | 3 +++ fastlane/metadata/id/release_notes.txt | 3 +++ fastlane/metadata/ja/release_notes.txt | 3 +++ fastlane/metadata/ko/release_notes.txt | 3 +++ fastlane/metadata/nl-NL/release_notes.txt | 3 +++ fastlane/metadata/tr/release_notes.txt | 3 +++ fastlane/metadata/zh-Hant/release_notes.txt | 3 +++ 9 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 fastlane/metadata/es-ES/release_notes.txt create mode 100644 fastlane/metadata/fr-FR/release_notes.txt create mode 100644 fastlane/metadata/id/release_notes.txt create mode 100644 fastlane/metadata/ja/release_notes.txt create mode 100644 fastlane/metadata/ko/release_notes.txt create mode 100644 fastlane/metadata/nl-NL/release_notes.txt create mode 100644 fastlane/metadata/tr/release_notes.txt create mode 100644 fastlane/metadata/zh-Hant/release_notes.txt diff --git a/fastlane/metadata/ar-SA/keywords.txt b/fastlane/metadata/ar-SA/keywords.txt index 66c12533b..be7cee772 100644 --- a/fastlane/metadata/ar-SA/keywords.txt +++ b/fastlane/metadata/ar-SA/keywords.txt @@ -1 +1 @@ -ملحوظات,ملحوظة,مهام مصغرة,صحيفة,مذكرات,مزامنة,قائمة مهام,مفكرة,بسيط,مفكرة,وسم قائمة مهام,كتابة \ No newline at end of file +ملحوظات,ملحوظة,مهام مصغرة,صحيفة,مذكرات,مزامنة,قائمة مهام,مفكرة,بسيط,مفكرة,وسم قائمة مهام,كتابة,مذكرة diff --git a/fastlane/metadata/es-ES/release_notes.txt b/fastlane/metadata/es-ES/release_notes.txt new file mode 100644 index 000000000..47e031564 --- /dev/null +++ b/fastlane/metadata/es-ES/release_notes.txt @@ -0,0 +1,3 @@ +- Se han actualizado los iconos para que funcionen con los nuevos estilos de iOS 18 +- Añade la opción de inicio de sesión «fall back» con nombre de usuario y contraseña para iniciar sesión +- Se ha actualizado el enlace que lleva al aviso de privacidad para usuarios de California diff --git a/fastlane/metadata/fr-FR/release_notes.txt b/fastlane/metadata/fr-FR/release_notes.txt new file mode 100644 index 000000000..985891238 --- /dev/null +++ b/fastlane/metadata/fr-FR/release_notes.txt @@ -0,0 +1,3 @@ +- Mise à jour des icônes pour qu’elles fonctionnent avec les nouveaux styles d’iOS 18 +- Ajout d’une connexion de secours avec identifiant et mot de passe en option +- Mise à jour du lien vers l’avis de confidentialité pour les utilisateurs californiens diff --git a/fastlane/metadata/id/release_notes.txt b/fastlane/metadata/id/release_notes.txt new file mode 100644 index 000000000..cd13aa2c3 --- /dev/null +++ b/fastlane/metadata/id/release_notes.txt @@ -0,0 +1,3 @@ +- Perbarui ikon untuk dapat bekerja dengan penataan iOS 18 yang baru +- Tambahkan login sementara dengan menggunakan nama pengguna dan kata sandi +- Pembaruan tautan pada pemberitahuan privasi bagi pengguna di California diff --git a/fastlane/metadata/ja/release_notes.txt b/fastlane/metadata/ja/release_notes.txt new file mode 100644 index 000000000..0eea9f843 --- /dev/null +++ b/fastlane/metadata/ja/release_notes.txt @@ -0,0 +1,3 @@ +- 新しい iOS 18 のスタイルに対応するようにアイコンを更新しました +- ログインにユーザー名とパスワードのオプションを使用するフォールバックログインを追加します +- カリフォルニア州のユーザーへのプライバシー通知のリンクを更新しました diff --git a/fastlane/metadata/ko/release_notes.txt b/fastlane/metadata/ko/release_notes.txt new file mode 100644 index 000000000..36b03c3d3 --- /dev/null +++ b/fastlane/metadata/ko/release_notes.txt @@ -0,0 +1,3 @@ +- 새로운 iOS 18 스타일에서 지원하도록 아이콘이 업데이트됨 +- 사용자명과 비밀번호로 로그인할 수 있는 대체 로그인 옵션 추가 +- 캘리포니아 사용자를 위한 개인정보 취급방침 링크가 업데이트됨 diff --git a/fastlane/metadata/nl-NL/release_notes.txt b/fastlane/metadata/nl-NL/release_notes.txt new file mode 100644 index 000000000..86db7b618 --- /dev/null +++ b/fastlane/metadata/nl-NL/release_notes.txt @@ -0,0 +1,3 @@ +- Pictogrammen bijgewerkt om te werken met nieuwe iOS 18-stijlen +-Back-up login toevoegen met gebruikersnaam en wachtwoordoptie om in te loggen +-Link naar privacyverklaring voor gebruikers in Californië bijgewerkt diff --git a/fastlane/metadata/tr/release_notes.txt b/fastlane/metadata/tr/release_notes.txt new file mode 100644 index 000000000..d2947be0a --- /dev/null +++ b/fastlane/metadata/tr/release_notes.txt @@ -0,0 +1,3 @@ +- Yeni iOS 18 stilleriyle çalışması için simgeler güncellendi +- Oturum açmak için kullanıcı ve şifre seçeneği içeren ikinci oturum açma eklendi +- Kaliforniya'daki kullanıcılar için gizlilik bildirimine giden bağlantı güncellendi diff --git a/fastlane/metadata/zh-Hant/release_notes.txt b/fastlane/metadata/zh-Hant/release_notes.txt new file mode 100644 index 000000000..f689b343d --- /dev/null +++ b/fastlane/metadata/zh-Hant/release_notes.txt @@ -0,0 +1,3 @@ +- 更新圖示以搭配新的 iOS 18 樣式 +- 新增可透過使用者名稱和密碼選項登入的備用登入方式 +- 更新了加州使用者隱私權聲明的連結 From cfdee16d2206aad9d048c323a7f43b952171c97f Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Sat, 2 Nov 2024 08:07:26 +1100 Subject: [PATCH 5/6] Trim ar-SA keywords to be less than 100 characters --- fastlane/metadata/ar-SA/keywords.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/metadata/ar-SA/keywords.txt b/fastlane/metadata/ar-SA/keywords.txt index be7cee772..66c12533b 100644 --- a/fastlane/metadata/ar-SA/keywords.txt +++ b/fastlane/metadata/ar-SA/keywords.txt @@ -1 +1 @@ -ملحوظات,ملحوظة,مهام مصغرة,صحيفة,مذكرات,مزامنة,قائمة مهام,مفكرة,بسيط,مفكرة,وسم قائمة مهام,كتابة,مذكرة +ملحوظات,ملحوظة,مهام مصغرة,صحيفة,مذكرات,مزامنة,قائمة مهام,مفكرة,بسيط,مفكرة,وسم قائمة مهام,كتابة \ No newline at end of file From 73ef833c9bdb884922a39c4fa21b39723628fbc2 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Sat, 2 Nov 2024 08:07:27 +1100 Subject: [PATCH 6/6] Bump version number --- config/Version.Public.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/Version.Public.xcconfig b/config/Version.Public.xcconfig index 517286b67..5cee0badb 100644 --- a/config/Version.Public.xcconfig +++ b/config/Version.Public.xcconfig @@ -1,2 +1,2 @@ -VERSION_LONG = 4.55.0.3 +VERSION_LONG = 4.55.0.4 VERSION_SHORT = 4.55