fastlane-plugin-stream_actions 0.3.62 → 0.3.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cfa09a1752b54d7444c05071aff41c0257b4e846b7f037fc1e783586d3a2755
-  data.tar.gz: 5714bac9e4e21a18c85a1e4d281764514d6756a31c868e70bdd5ea0e46c7e7a1
+  metadata.gz: d3058e337109a1d70cf0df36ebecbc711edc31fb912babb9256ceb6d2e104101
+  data.tar.gz: 8821234fa7633ebfd74feae8250a17e521a1053b6661d2c7c2c3a34295332d5f
 SHA512:
-  metadata.gz: 7694729d49c060aa784427dec52c0b6a5285897ba9173b4b13e20e9b0f7bf167842915152998c4731cb713b1f44282442073bd4da12781d40b7f9a82e173daab
-  data.tar.gz: ecfc5143455143e470c4858a5114f94c582e4dc1f77e0eb355f6a71935c2aaf396efc1af6b57b442c4ec9d822e57a32cf4bc021c173164f8d629221276e469a4
+  metadata.gz: aeeccba7bfd43453f728160290c47ad9477bfb4a3a20dd9a695e2d6ccf958d67d6fc21a6dedb003099fcca59a2a9a8b399e149710d8ffb53f17e59bbf82a8039
+  data.tar.gz: dba5eb0169b3f309ce7d05ccc376955dad5aee8b35b0bff8b0dc0be2451e4e25047bc503924a8aaacdae7e02c484efe1472405bda82aa31c8c09b4958b0c311a

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

@@ -3,11 +3,12 @@ module Fastlane
     class MergeMainToDevelopAction < Action
       def self.run(params)
         other_action.ensure_git_status_clean
+        sh('git config pull.ff only')
+        sh('git fetch --all --tags --prune')
         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 pull origin main --ff-only')
+        sh('git checkout develop')
+        sh('git pull origin develop --ff-only')
         sh('git merge main')
         sh('git push origin develop')
       end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module StreamActions
-    VERSION = '0.3.62'
+    VERSION = '0.3.63'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-stream_actions
 version: !ruby/object:Gem::Version
-  version: 0.3.62
+  version: 0.3.63
 platform: ruby
 authors:
 - GetStream