fastlane-plugin-wpmreleasetoolkit 13.5.0 → 13.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d022bdc136add014c305e7d06dee672e4cd9bb34bcac77ccef7a876f54597c9d
-  data.tar.gz: 92bee8e4989223907a6f2e8c8e733219ffba191c49a756e01e60dbbe95a3c913
+  metadata.gz: 7b2482314dd0f766ed17163b49308b9054982c3e85bcf017310611e53d43155c
+  data.tar.gz: b942e2a2c4d0778420d2f15ec35d6a8b9f2718d237bb687aeb5ee6b6cdae86e1
 SHA512:
-  metadata.gz: 690c4f8a452cceda096e4dc9f3667e9a2fbb44c67f7377a58ba1267f1aa7753c3403cabc279e6f28cc2d4b9ba4da43162433dd14034f944001e6b4038d164595
-  data.tar.gz: 669a524c570d9704139a297c54469acfdd86c41da83b1e6754b693e98b27afd24805328199cbe8f449d71e10c7588db12df636c8b08bad8bb86da3b1527a832e
+  metadata.gz: c033a332896e9151be106d316960beecb8f275bfa14865ff716e663508318ef29240ee668507436337e8a16bb80ef296ae31abb7ca774597f1f3ea014c123489
+  data.tar.gz: 4120e9a3d1c7974959b6c2a6b950ec827ea23c524535fb754c2c9130f95395f65f0ca202adb9fc93e5c94f36b34212512dc389022ea487d2e31b726991484a7d

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

@@ -124,6 +124,7 @@ module Fastlane
           # When a callback was provided, do the pre-check about valid PR _only_ at that point, in case the callback added new commits
           unless can_merge?(intermediate_branch, into: base_branch)
             UI.error("Nothing to merge from #{intermediate_branch} into #{base_branch}. Skipping PR creation.")
+            Action.sh('git', 'checkout', head_branch) # Switch to original branch so we can delete the intermediate branch
             Fastlane::Helper::GitHelper.delete_local_branch_if_exists!(intermediate_branch)
             return nil
           end

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.5.0'
+    VERSION = '13.5.2'
   end
 end

metadata

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