Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Comment on lines 11 to +13
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ℹ️ I pondered marking this as breaking change, given the 'Windows' and 'Microsoft Store' values that were previously valid are now invalid.

That being said, because Studio is the only client that used those values, and will adopt the new release-toolkit as soon as this PR is merged and a new version is released—since they are the ones who asked for those values—I figured it was not worth marking this as a breaking change per se.


### Bug Fixes

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Comment on lines -37 to +40
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ℹ️ As discussed in https://linear.app/a8c/issue/AINFRA-1457/update-appscdn-backend-and-release-toolkit-for-new-windows#comment-646bbf97, we've agreed to get rid of the original plain 'Windows' and 'Microsoft Store' values (as opposed to keeping them for backwards compatibility) since Studio was the only client product to use those old non-architecture-specific values in the first place.

].freeze
# See https://github.a8c.com/Automattic/wpcom/blob/trunk/wp-content/lib/a8c/cdn/src/enums/enum-install-type.php
VALID_INSTALL_TYPES = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
begin
$skip_magick = false
require 'RMagick'
rescue LoadError
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated to this PR, but was necessary to fix a bug preventing me to run the tests (rspec) locally when the version of RMagic installed on my Mac was not the one expected.

rescue LoadError, RuntimeError
$skip_magick = true
end
require 'json'
Expand Down
2 changes: 1 addition & 1 deletion spec/upload_build_to_apps_cdn_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down