fastlane-plugin-wpmreleasetoolkit 12.2.0 → 12.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5efb1f6f88d1bb1617313112768ef93497cabe3897bb4834c5026a4e9a68ced0
-  data.tar.gz: 8eaef85d47b2ec7be3e2da0693856923c02e6f67b65707e4143d7241147a7435
+  metadata.gz: 24ece3855d069cb67f8e0a3eca97e11f14af1361ce2c00084289a21b23b99b10
+  data.tar.gz: 7fda68ae30e60082db9276f89649dcea58d279be623f1ecd6ea96eddf47394cc
 SHA512:
-  metadata.gz: 7c05b2af7ca941a5afb52b703f3f0ee315e0ab48ffa87de88c48c5f22bbc1db82f0a819c7e4f2b10e754b6558569d801431e64b00f491e282eadd9885c4f75ac
-  data.tar.gz: fc832aaf5f31e2e6b3f51c268f38529f056dc40a0971fb67e962da313634e2c56580eeac23f8d2e94f2f3dcc74ad3d69b0a465724afb7c178501103a5c01d309
+  metadata.gz: 351386b21f54221ebd0b821caaa9bf1b3a2584c4d14d292e4d5a607ab1ef421443df685d25c464da00dc9a6d5abe7b4934a670afa092b9a04776f504f457eba6
+  data.tar.gz: 5ac9f250c4baef6cab62e214b94ead03fd6ecd5c5618a37f62ed230963c34c7d04951db78b3382e4d0abfa8510d1a571e8a12ca8d0df42d814d5cbe9a51c7679

data/README.md

@@ -24,15 +24,17 @@ This guide also includes some tips about configuring your environment and IDE (e
 
 When you need to do a new release of the `release-toolkit`, simply run `rake new_release` and follow the instructions.
 
+> [!NOTE]  
 > This task will:
 >  - Show you the CHANGELOG/release notes it's about to use for that version
 >  - Deduce which version number to use according to [SemVer](https://semver.org/) rules, and ask you to confirm that version number
 >  - Create a `release/<x.y>` branch, update the version number in all the right places, and create a PR for those changes
 
-Submit the PR, adding the `Releases` label to it and adding the `owl-team` as reviewers.
+Submit the PR, adding the `Releases` label to it and adding the `@wordpress-mobile/apps-infrastructure` team as reviewers.
 
 Once that PR is approved and merged, create a new GitHub Release, copy/pasting the CHANGELOG entries for that GH release's description.
 
+> [!IMPORTANT]  
 > Publishing the GitHub Release will create the associated tag as well, which will trigger the CI job that will ultimately `gem push` the gem on RubyGems.
 
 ## Security
@@ -50,4 +52,4 @@ If you have questions about getting setup or just want to say hi, join the [Word
 
 ## License
 
-Mobile Release Toolkit is an Open Source project covered by the [GNU General Public License version 2](LICENSE).
+Mobile Release Toolkit is an Open Source project covered by the [GNU General Public License version 2](LICENSE).

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

@@ -92,10 +92,11 @@ module Fastlane
         intermediate_branch = "merge/#{head_branch.gsub('/', '-')}-into-#{base_branch.gsub('/', '-')}"
 
         if Fastlane::Helper::GitHelper.branch_exists_on_remote?(branch_name: intermediate_branch)
-          UI.user_error!("The intermediate branch `#{intermediate_branch}` already exists. Please check if there is an existing Pull Request that needs to be merged or closed first, or delete the branch.")
-          return nil
+          UI.important("An intermediate branch `#{intermediate_branch}` already exists on the remote. It will be deleted and GitHub will close any associated existing PR.")
+          Fastlane::Helper::GitHelper.delete_remote_branch_if_exists!(intermediate_branch)
         end
 
+        Fastlane::Helper::GitHelper.delete_local_branch_if_exists!(intermediate_branch)
         Fastlane::Helper::GitHelper.create_branch(intermediate_branch)
 
         intermediate_branch_created_callback&.call(base_branch, intermediate_branch)

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

@@ -232,6 +232,32 @@ module Fastlane
         !Action.sh('git', 'ls-remote', '--heads', remote_name, branch_name).empty?
       end
 
+      # Delete a local branch if it exists.
+      #
+      # @param [String] branch_name The name of the local branch to delete.
+      # @return [Boolean] true if the branch was deleted, false if not (e.g. no such local branch existed in the first place)
+      #
+      def self.delete_local_branch_if_exists!(branch_name)
+        git_repo = Git.open(Dir.pwd)
+        return false unless git_repo.is_local_branch?(branch_name)
+
+        git_repo.branch(branch_name).delete
+        true
+      end
+
+      # Delete a remote branch if it exists.
+      #
+      # @param [String] branch_name The name of the remote branch to delete.
+      # @param [String] remote_name The name of the remote to delete the branch from. Defaults to 'origin'
+      # @return [Boolean] true if the branch was deleted, false if not (e.g. no such local branch existed in the first place)
+      #
+      def self.delete_remote_branch_if_exists!(branch_name, remote_name: 'origin')
+        git_repo = Git.open(Dir.pwd)
+        return false unless git_repo.branches.any? { |b| b.remote&.name == remote_name && b.name == branch_name }
+
+        git_repo.push(remote_name, branch_name, delete: true)
+      end
+
       # Checks whether a given path is ignored by Git, relying on Git's `check-ignore` under the hood.
       #
       # @param [String] path The path to check against `.gitignore`

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

@@ -2,6 +2,6 @@
 
 module Fastlane
   module Wpmreleasetoolkit
-    VERSION = '12.2.0'
+    VERSION = '12.2.1'
   end
 end

metadata

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