Commit 78c63238 authored by DJ Mountney's avatar DJ Mountney

Merge remote-tracking branch 'origin/fix-version-mapping-master-gate'

MR: https://gitlab.com/charts/gitlab/merge_requests/722
parent efb11fca
Pipeline #51946433 passed with stages
in 60 minutes and 27 seconds
......@@ -139,7 +139,7 @@ class VersionUpdater
if @options.include_subcharts
@subchart_versions.each do |sub_chart, update_app_version|
sub_chart.update_versions(@chart_version, update_app_version)
sub_chart.update_versions(@chart_version, branch == 'master' ? nil : update_app_version)
end
end
end
......@@ -211,9 +211,11 @@ class VersionUpdater
def get_current_branch
git_command = 'git rev-parse --abbrev-ref HEAD 2>&1'.freeze
output = `#{git_command}`.chomp
output = `#{git_command}`
raise(StandardError.new(output)) unless $?.success?
output.chomp
end
end
......
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