Update secpick script
This commit is contained in:
parent
651d12645b
commit
9ba303bfed
1 changed files with 22 additions and 1 deletions
23
bin/secpick
23
bin/secpick
|
@ -1,4 +1,7 @@
|
||||||
#!/usr/bin/env ruby
|
#!/usr/bin/env ruby
|
||||||
|
# frozen_string_literal: false
|
||||||
|
|
||||||
|
require 'active_support/core_ext/object/to_query'
|
||||||
require 'optparse'
|
require 'optparse'
|
||||||
require 'open3'
|
require 'open3'
|
||||||
require 'rainbow/refinement'
|
require 'rainbow/refinement'
|
||||||
|
@ -6,6 +9,7 @@ using Rainbow
|
||||||
|
|
||||||
BRANCH_PREFIX = 'security'.freeze
|
BRANCH_PREFIX = 'security'.freeze
|
||||||
REMOTE = 'dev'.freeze
|
REMOTE = 'dev'.freeze
|
||||||
|
NEW_MR_URL = 'https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/new'.freeze
|
||||||
|
|
||||||
options = { version: nil, branch: nil, sha: nil }
|
options = { version: nil, branch: nil, sha: nil }
|
||||||
|
|
||||||
|
@ -48,7 +52,24 @@ end.freeze
|
||||||
|
|
||||||
command = "git fetch #{REMOTE} #{stable_branch} && git checkout #{stable_branch} && git pull #{REMOTE} #{stable_branch} && git checkout -B #{branch} && git cherry-pick #{options[:sha]} && git push #{REMOTE} #{branch} && git checkout #{original_branch}"
|
command = "git fetch #{REMOTE} #{stable_branch} && git checkout #{stable_branch} && git pull #{REMOTE} #{stable_branch} && git checkout -B #{branch} && git cherry-pick #{options[:sha]} && git push #{REMOTE} #{branch} && git checkout #{original_branch}"
|
||||||
|
|
||||||
_stdin, stdout, stderr = Open3.popen3(command)
|
stdin, stdout, stderr, wait_thr = Open3.popen3(command)
|
||||||
|
|
||||||
puts stdout.read&.green
|
puts stdout.read&.green
|
||||||
puts stderr.read&.red
|
puts stderr.read&.red
|
||||||
|
|
||||||
|
if wait_thr.value.success?
|
||||||
|
params = {
|
||||||
|
merge_request: {
|
||||||
|
source_branch: branch,
|
||||||
|
target_branch: stable_branch,
|
||||||
|
title: "WIP: [#{options[:version].tr('-', '.')}] ",
|
||||||
|
description: '/label ~security'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
puts "#{NEW_MR_URL}?#{params.to_query}".blue
|
||||||
|
end
|
||||||
|
|
||||||
|
stdin.close
|
||||||
|
stdout.close
|
||||||
|
stderr.close
|
||||||
|
|
Loading…
Reference in a new issue