make correctsion for ce and ee

parent b329ac11
......@@ -20,13 +20,13 @@ namespace :auto_deploy do
abort('AUTO_DEPLOY_BRANCH must be set for this rake task'.colorize(:red)) unless auto_deploy_branch
puts "We'll pick into #{auto_deploy_branch}"
scrub_version = auto_deploy_branch.match(/^(\d+-\d+)-auto-deploy-(\d+)-ee$/)[1].tr('-', '.')
scrub_version = auto_deploy_branch.match(/^(\d+-\d+)-auto-deploy.*/)[1].tr('-', '.')
version = ReleaseTools::Version.new(scrub_version).to_ee
$stdout.puts "--> Picking for #{version}..."
$stdout.puts "Cherry-picking for EE..."
results = ReleaseTools::CherryPick::Service
.new(ReleaseTools::Project::GitlabEe, version, auto_deploy_branch)
.new(ReleaseTools::Project::GitlabEe, version, "#{auto_deploy_branch}-ee")
.dry_run
results.each do |result|
......@@ -34,6 +34,7 @@ namespace :auto_deploy do
end
$stdout.puts "Cherry-picking for CE..."
version = ReleaseTools::Version.new(scrub_version).to_ce
results = ReleaseTools::CherryPick::Service
.new(ReleaseTools::Project::GitlabCe, version, auto_deploy_branch)
.dry_run
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment