From 9359dc01d08052aa04ed848668d52ba510e34bc2 Mon Sep 17 00:00:00 2001 From: Olivier Halligon Date: Thu, 30 Oct 2025 19:12:55 +0100 Subject: [PATCH 1/3] Add new ARM64 platforms --- .../actions/common/upload_build_to_apps_cdn.rb | 6 ++++-- spec/upload_build_to_apps_cdn_spec.rb | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/actions/common/upload_build_to_apps_cdn.rb b/lib/fastlane/plugin/wpmreleasetoolkit/actions/common/upload_build_to_apps_cdn.rb index b16b7c90b..acab59d47 100644 --- a/lib/fastlane/plugin/wpmreleasetoolkit/actions/common/upload_build_to_apps_cdn.rb +++ b/lib/fastlane/plugin/wpmreleasetoolkit/actions/common/upload_build_to_apps_cdn.rb @@ -34,8 +34,10 @@ class UploadBuildToAppsCdnAction < Action 'Mac - Silicon', 'Mac - Intel', 'Mac - Any', - 'Windows', - 'Microsoft Store', + 'Windows - x86', + 'Windows - ARM64', + 'Microsoft Store - x86', + 'Microsoft Store - ARM64', ].freeze # See https://github.a8c.com/Automattic/wpcom/blob/trunk/wp-content/lib/a8c/cdn/src/enums/enum-install-type.php VALID_INSTALL_TYPES = [ diff --git a/spec/upload_build_to_apps_cdn_spec.rb b/spec/upload_build_to_apps_cdn_spec.rb index 32a62a3c5..96788708f 100644 --- a/spec/upload_build_to_apps_cdn_spec.rb +++ b/spec/upload_build_to_apps_cdn_spec.rb @@ -421,7 +421,7 @@ def expected_form_part(name:, value:, filename: nil) version: test_version, file_path: file_path ) - end.to raise_error(FastlaneCore::Interface::FastlaneError, 'Platform must be one of: Android, iOS, Mac - Silicon, Mac - Intel, Mac - Any, Windows, Microsoft Store') + end.to raise_error(FastlaneCore::Interface::FastlaneError, "Platform must be one of: #{described_class::VALID_PLATFORMS.join(', ')}") end end From 2d4065dc85ed1caab253d155fb021a0a901193a6 Mon Sep 17 00:00:00 2001 From: Olivier Halligon Date: Thu, 30 Oct 2025 19:14:37 +0100 Subject: [PATCH 2/3] Fix ImageMagick version error catching --- .../plugin/wpmreleasetoolkit/helper/promo_screenshots_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/helper/promo_screenshots_helper.rb b/lib/fastlane/plugin/wpmreleasetoolkit/helper/promo_screenshots_helper.rb index 827c064c5..38fdab80c 100644 --- a/lib/fastlane/plugin/wpmreleasetoolkit/helper/promo_screenshots_helper.rb +++ b/lib/fastlane/plugin/wpmreleasetoolkit/helper/promo_screenshots_helper.rb @@ -4,7 +4,7 @@ begin $skip_magick = false require 'RMagick' -rescue LoadError +rescue LoadError, RuntimeError $skip_magick = true end require 'json' From 54162f61a215b876dfbb902a43a74864d01deff9 Mon Sep 17 00:00:00 2001 From: Olivier Halligon Date: Thu, 30 Oct 2025 19:28:11 +0100 Subject: [PATCH 3/3] Add CHANGELOG entry --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 379cd1cb8..a3e8f8698 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ _None_ ### New Features -_None_ +- `upload_build_to_apps_cdn`: Update the list of valid values for `platform` to now support _both_ `x86` and `ARM64` for the `Microsoft Store` and `Windows` platforms. [#669] ### Bug Fixes