gitsflow 0.2.1 → 0.2.2
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of gitsflow might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/lib/sflow.rb +8 -4
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 9a313b9a90fc3e2d4aa3d61948cb1a8676207eff5b91c34bb7c830bf7acacec5
|
|
4
|
+
data.tar.gz: 076cfa6afd9e5cbb87ae1cf81eb5334c14db826dfb80a7edcac708ebf610feef
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 5a1a70d837daa1b26bc09a75de606b28f7f61f87f210e803d58fb2d06acfd8972ec3ff04c956432383b87d70c334c2d788828fd2cd3e6e3aecbcd1b59ec3999f
|
|
7
|
+
data.tar.gz: 1a229b6096b79ea7030e79e2453fa8bdd4b85c01d03454afcef8582d48241529f6b3cc0e417e9ed6eaf0fd498cb114a3ee717a656a389548fff07b8288263618
|
data/lib/sflow.rb
CHANGED
|
@@ -15,7 +15,7 @@ load 'Git/git.rb'
|
|
|
15
15
|
# require './lib/gitlab/issue.rb'
|
|
16
16
|
# require './lib/gitlab/merge_request.rb'
|
|
17
17
|
class SFlow
|
|
18
|
-
VERSION = "0.2.
|
|
18
|
+
VERSION = "0.2.2"
|
|
19
19
|
$TYPE = ARGV[0]
|
|
20
20
|
$ACTION = ARGV[1]
|
|
21
21
|
$PARAM1 = ARGV[2]
|
|
@@ -302,13 +302,17 @@ class SFlow
|
|
|
302
302
|
release_branch = "-release/#{version}"
|
|
303
303
|
issue_release = GitLab::Issue.find_by_branch(release_branch)
|
|
304
304
|
|
|
305
|
+
Git.merge issue_release.branch, 'develop'
|
|
306
|
+
Git.push 'develop'
|
|
307
|
+
|
|
308
|
+
|
|
305
309
|
type = issue_release.labels.include?('hotfix') ? 'hotfix' : nil
|
|
306
310
|
mr_master = GitLab::MergeRequest.new(
|
|
307
311
|
source_branch: issue_release.branch,
|
|
308
312
|
target_branch: 'master',
|
|
309
313
|
issue_iid: issue_release.iid,
|
|
310
|
-
title: "
|
|
311
|
-
description: "Closes ##{issue_release.iid}",
|
|
314
|
+
title: "##{issue_release.iid} - #{version} - Reintegration #{issue_release.branch} into master",
|
|
315
|
+
description: "Closes ##{issue_release.iid} ",
|
|
312
316
|
type: type
|
|
313
317
|
)
|
|
314
318
|
mr_master.create
|
|
@@ -323,7 +327,7 @@ class SFlow
|
|
|
323
327
|
# )
|
|
324
328
|
# mr_develop.create
|
|
325
329
|
|
|
326
|
-
|
|
330
|
+
|
|
327
331
|
|
|
328
332
|
# remove_labels = [$GITLAB_NEXT_RELEASE_LIST]
|
|
329
333
|
remove_labels = []
|