fastlane-plugin-stream_actions 0.3.59 → 0.3.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18096c31e929562f63931390e7aedeea76dd7673a77884e4f260048f57cee7ca
-  data.tar.gz: '08f19c415bc702f79dc90a7a9a4dc074bf5e4ad8658637fa89b8635b7003ed58'
+  metadata.gz: 2eb47d690f49f99e9e5eb33059cd52a83fea990ac32d4a74a55ddbadfc672a4d
+  data.tar.gz: f72186ee2ab89ed705e73f182405dc8e6e5a26064edf9d7d54b3a198c36b69b0
 SHA512:
-  metadata.gz: 78dbfe8cd7c7f1ace4c78da3caf14c2cfff1f093ac9ef87b8e962a5ef4baf40c63c0f48c9af8d49fafef2ad25613b26c5894f96af0fbd0371cb5dd3897fb8f5b
-  data.tar.gz: 0f51e598d86eaf9c8e3dc60685d1db2669534d2424ec460873f007538bc7d192680cc89b3fdab50a1b40b8eeeb7aed90befc532c0da80377ce2ca91ac52d4083
+  metadata.gz: 7c9482510bea5efc9420998044682d5b82102d2f70d0b42f0d941d68af496e98c4d64b347d3ccadba363cfe239f2a8714a81d2045fbb1a23df5f6c435f153e98
+  data.tar.gz: 2fb17159311e1c45e1c1f147546fc274fc8cc3951bae8ba5618883e0e30da872b722ec141eebe8ca4e3bdf4ff8f560971c6a0feb5d74d7f13383078f49b1612f

data/lib/fastlane/plugin/stream_actions/actions/merge_main_to_develop.rb

@@ -0,0 +1,32 @@
+module Fastlane
+  module Actions
+    class MergeMainToDevelopAction < Action
+      def self.run(params)
+        other_action.ensure_git_status_clean
+        sh('git checkout main')
+        sh('git pull origin main')
+        sh('git checkout origin/develop')
+        sh('git pull origin develop')
+        sh('git log develop..main')
+        sh('git merge main')
+        sh('git push origin develop')
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.description
+        'Merge main branch to develop'
+      end
+
+      def self.available_options
+        []
+      end
+
+      def self.is_supported?(platform)
+        true
+      end
+    end
+  end
+end

data/lib/fastlane/plugin/stream_actions/actions/merge_release_to_main.rb

@@ -0,0 +1,66 @@
+module Fastlane
+  module Actions
+    class MergeReleaseToMainAction < Action
+      def self.run(params)
+        other_action.ensure_git_status_clean
+
+        release_branch =
+          if is_ci
+            # This API operation needs the "admin:org" scope.
+            ios_team = `gh api orgs/GetStream/teams/#{params[:github_team_name]}/members -q '.[].login'`.split("\n")
+            UI.user_error!("#{params[:author]} is not a member of the iOS Team") unless ios_team.include?(params[:author])
+
+            other_action.current_branch
+          else
+            release_branches = sh(command: 'git branch -a').delete(' ').split("\n").grep(%r(origin/.*release/))
+            UI.user_error!("Expected 1 release branch, found #{release_branches.size}") if release_branches.size != 1
+
+            release_branches.first
+          end
+
+        UI.user_error!("`#{release_branch}`` branch does not match the release branch pattern: `release/*`") unless release_branch.start_with?('release/')
+
+        sh('git config pull.ff only')
+        sh('git fetch --all --tags --prune')
+        sh("git checkout #{release_branch}")
+        sh("git pull origin #{release_branch} --ff-only")
+        sh('git checkout main')
+        sh('git pull origin main --ff-only')
+        sh("git merge #{release_branch} --ff-only")
+        sh('git push origin main')
+
+        comment = "Publication of the release has been launched 👍"
+        UI.important(comment)
+        other_action.pr_comment(text: comment)
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.description
+        'Merge release branch to main'
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(
+            env_name: 'USER_LOGIN',
+            key: :author,
+            description: 'Github user name',
+            optional: true
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :github_team_name,
+            description: 'Github team name',
+            default_value: 'ios-developers'
+          )
+        ]
+      end
+
+      def self.is_supported?(platform)
+        true
+      end
+    end
+  end
+end

data/lib/fastlane/plugin/stream_actions/actions/pr_create.rb

@@ -2,7 +2,6 @@ module Fastlane
   module Actions
     class PrCreateAction < Action
       def self.run(params)
-        params[:base_branch] ||= 'develop'
         sh("git checkout -b #{params[:head_branch]}")
         sh('git restore Brewfile.lock.json || true')
         sh('git add -A')
@@ -40,7 +39,8 @@ module Fastlane
           FastlaneCore::ConfigItem.new(
             key: :base_branch,
             description: 'Base branch',
-            is_string: true
+            is_string: true,
+            default_value: 'develop'
           ),
           FastlaneCore::ConfigItem.new(
             key: :head_branch,

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

@@ -1,5 +1,5 @@
 module Fastlane
   module StreamActions
-    VERSION = '0.3.59'
+    VERSION = '0.3.61'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-stream_actions
 version: !ruby/object:Gem::Version
-  version: 0.3.59
+  version: 0.3.61
 platform: ruby
 authors:
 - GetStream
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-14 00:00:00.000000000 Z
+date: 2024-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xctest_list
@@ -238,6 +238,8 @@ files:
 - lib/fastlane/plugin/stream_actions/actions/git_status.rb
 - lib/fastlane/plugin/stream_actions/actions/install_ios_runtime.rb
 - lib/fastlane/plugin/stream_actions/actions/is_check_required.rb
+- lib/fastlane/plugin/stream_actions/actions/merge_main_to_develop.rb
+- lib/fastlane/plugin/stream_actions/actions/merge_release_to_main.rb
 - lib/fastlane/plugin/stream_actions/actions/pod_push_safely.rb
 - lib/fastlane/plugin/stream_actions/actions/pr_comment.rb
 - lib/fastlane/plugin/stream_actions/actions/pr_create.rb