fastlane-plugin-stream_actions 0.3.62 → 0.3.63
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d3058e337109a1d70cf0df36ebecbc711edc31fb912babb9256ceb6d2e104101
|
|
4
|
+
data.tar.gz: 8821234fa7633ebfd74feae8250a17e521a1053b6661d2c7c2c3a34295332d5f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: aeeccba7bfd43453f728160290c47ad9477bfb4a3a20dd9a695e2d6ccf958d67d6fc21a6dedb003099fcca59a2a9a8b399e149710d8ffb53f17e59bbf82a8039
|
|
7
|
+
data.tar.gz: dba5eb0169b3f309ce7d05ccc376955dad5aee8b35b0bff8b0dc0be2451e4e25047bc503924a8aaacdae7e02c484efe1472405bda82aa31c8c09b4958b0c311a
|
|
@@ -3,11 +3,12 @@ module Fastlane
|
|
|
3
3
|
class MergeMainToDevelopAction < Action
|
|
4
4
|
def self.run(params)
|
|
5
5
|
other_action.ensure_git_status_clean
|
|
6
|
+
sh('git config pull.ff only')
|
|
7
|
+
sh('git fetch --all --tags --prune')
|
|
6
8
|
sh('git checkout main')
|
|
7
|
-
sh('git pull origin main')
|
|
8
|
-
sh('git checkout
|
|
9
|
-
sh('git pull origin develop')
|
|
10
|
-
sh('git log develop..main')
|
|
9
|
+
sh('git pull origin main --ff-only')
|
|
10
|
+
sh('git checkout develop')
|
|
11
|
+
sh('git pull origin develop --ff-only')
|
|
11
12
|
sh('git merge main')
|
|
12
13
|
sh('git push origin develop')
|
|
13
14
|
end
|