fastlane-plugin-wpmreleasetoolkit 13.4.0 → 13.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ace179f7cf145c3a8bc0e2b9fa917eaa4654b93fcc9b329ef44013f227111420
-  data.tar.gz: 1ddd2fe6be0810ec61a6089f44d60ff70599007cb1eb875de32c6df047cbfabe
+  metadata.gz: dfff41f7e06514a598cedc9d3815b0465bb543a26af079ac775812b4a689a614
+  data.tar.gz: 0d5c9349d56212cfa16fd9b731fcdc5318e23e12e5a1bdf7a23e3f8acf755783
 SHA512:
-  metadata.gz: deba3263e74215fd1b98373940d2eb1b259eda28587e6a730446c596e1559b6a5ad74c3f7260e76d642e6b9ba57d1c5a43f5dd53f64b9d780c4f0400f4c3fc89
-  data.tar.gz: 17bc9286fe256f21bcfa392bbd48a16d78c5130c1cb8191dc0931516695686eed42ba324a42155eb51a1f66eeefe74b8a44c79a8a24c612f7ad584d84af84f7f
+  metadata.gz: 84a281df90be326b5c1153a4a8ab27b55c8105169a50123537b86e2ca14ab0ff26e237b0f572941530a9b443f9d457c420fe80a46a1f1cf88baf6b862ef13e7f
+  data.tar.gz: d797602e89698606bb0c5f65d22cf469fff16341a503c5f3f97caef623fb36744252f770fe9df9018cff5c0b566ad8fd1787d4fe55aba07955c3bbf2013b2f3a

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/common/upload_build_to_apps_cdn.rb

@@ -15,11 +15,35 @@ module Fastlane
     end
 
     class UploadBuildToAppsCdnAction < Action
+      # See https://github.a8c.com/Automattic/wpcom/blob/trunk/wp-content/lib/a8c/cdn/src/enums/enum-resource-type.php
       RESOURCE_TYPE = 'Build'
+      # These are from the WordPress.com API, not the Apps CDN plugin
       VALID_POST_STATUS = %w[publish draft].freeze
-      VALID_BUILD_TYPES = %w[Alpha Beta Nightly Production Prototype].freeze
-      VALID_PLATFORMS = ['Android', 'iOS', 'Mac - Silicon', 'Mac - Intel', 'Mac - Any', 'Windows'].freeze
-      VALID_INSTALL_TYPES = ['Full Install', 'Update'].freeze
+      # See https://github.a8c.com/Automattic/wpcom/blob/trunk/wp-content/lib/a8c/cdn/src/enums/enum-build-type.php
+      VALID_BUILD_TYPES = %w[
+        Alpha
+        Beta
+        Nightly
+        Production
+        Prototype
+      ].freeze
+      # See https://github.a8c.com/Automattic/wpcom/blob/trunk/wp-content/lib/a8c/cdn/src/enums/enum-platform.php
+      VALID_PLATFORMS = [
+        'Android',
+        'iOS',
+        'Mac - Silicon',
+        'Mac - Intel',
+        'Mac - Any',
+        'Windows',
+        'Microsoft Store',
+      ].freeze
+      # See https://github.a8c.com/Automattic/wpcom/blob/trunk/wp-content/lib/a8c/cdn/src/enums/enum-install-type.php
+      VALID_INSTALL_TYPES = [
+        'Full Install',
+        'Update',
+      ].freeze
+      # See https://github.a8c.com/Automattic/wpcom/blob/trunk/wp-content/lib/a8c/cdn/src/enums/enum-visibility.php
+      VALID_VISIBILITIES = %i[internal external].freeze
 
       def self.run(params)
         UI.message('Uploading build to Apps CDN...')
@@ -179,6 +203,8 @@ module Fastlane
             type: String,
             verify_block: proc do |value|
               UI.user_error!('Product cannot be empty') if value.to_s.empty?
+              # Unlike for other parameters, we don't validate the product value against a list of valid values because we expect this list of
+              # supported products to be updated on the backend from time to time and we don't want to have to update the toolkit every time for it.
             end
           ),
           FastlaneCore::ConfigItem.new(
@@ -228,7 +254,7 @@ module Fastlane
             optional: false,
             type: Symbol,
             verify_block: proc do |value|
-              UI.user_error!('Visibility must be either :internal or :external') unless %i[internal external].include?(value)
+              UI.user_error!("Visibility must be one of: #{VALID_VISIBILITIES.map { "`:#{_1}`" }.join(', ')}") unless VALID_VISIBILITIES.include?(value.to_s.downcase.to_sym)
             end
           ),
           FastlaneCore::ConfigItem.new(

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/github_helper.rb

@@ -44,14 +44,42 @@ module Fastlane
       # @param [String] repository The repository name, including the organization (e.g. `wordpress-mobile/wordpress-ios`)
       # @param [Sawyer::Resource, String] milestone The milestone object, or title of the milestone, we want to fetch the list of PRs for (e.g.: `16.9`)
       # @param [Boolean] include_closed If set to true, will include both opened and closed PRs. Otherwise, will only include opened PRs.
-      # @return [Array<Sawyer::Resource>] A list of the PRs for the given milestone, sorted by number
+      # @return [Array<Sawyer::Resource>] A list of the PRs and issues for the given milestone, sorted by number
       #
       def get_prs_and_issues_for_milestone(repository:, milestone:, include_closed: false)
+        # While the `/search` API used with a classic tokens returns both issues and PRs, using a fine-grained tokens always require either 'is:issue' or 'is:pull-request',
+        # therefore we need to make two separate calls to cover both cases
+        issues = search_milestone_items(repository: repository, milestone: milestone, type: :issue, include_closed: include_closed)
+        prs = search_milestone_items(repository: repository, milestone: milestone, type: :pr, include_closed: include_closed)
+
+        (issues + prs).sort_by(&:number)
+      end
+
+      # Search for issues or PRs for a given milestone
+      #
+      # @param [String] repository The repository name, including the organization (e.g. `wordpress-mobile/wordpress-ios`)
+      # @param [Sawyer::Resource, String] milestone The milestone object, or title of the milestone
+      # @param [Symbol] type The type of items to search for (:issue or :pr/:pull_request)
+      # @param [Boolean] include_closed If set to true, will include both opened and closed items. Otherwise, will only include opened items.
+      # @return [Array<Sawyer::Resource>] A list of issues or PRs for the given milestone
+      #
+      def search_milestone_items(repository:, milestone:, type:, include_closed: false)
         milestone_title = milestone.is_a?(Sawyer::Resource) ? milestone.title : milestone
-        query = %(repo:#{repository} milestone:"#{milestone_title}")
+
+        # Map type symbol to GitHub search qualifier
+        type_qualifier = case type
+                         when :issue
+                           'is:issue'
+                         when :pr, :pull_request
+                           'is:pull-request'
+                         else
+                           raise ArgumentError, "Invalid type: #{type}. Must be :issue or :pr"
+                         end
+
+        query = %(repo:#{repository} milestone:"#{milestone_title}" #{type_qualifier})
         query += ' is:open' unless include_closed
 
-        client.search_issues(query)[:items].sort_by(&:number)
+        client.search_issues(query)[:items]
       end
 
       # Set/Update the milestone assigned to a given PR or issue

data/lib/fastlane/plugin/wpmreleasetoolkit/version.rb

@@ -2,6 +2,6 @@
 
 module Fastlane
   module Wpmreleasetoolkit
-    VERSION = '13.4.0'
+    VERSION = '13.5.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-wpmreleasetoolkit
 version: !ruby/object:Gem::Version
-  version: 13.4.0
+  version: 13.5.1
 platform: ruby
 authors:
 - Automattic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-05 00:00:00.000000000 Z
+date: 2025-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport