From 6eb1b81d0453de62f59bb254af85de4d82ef20d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Thu, 12 Sep 2019 10:41:28 +0200 Subject: Restore version bumping to `release:prepare_patch` --- task/release.rake | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/task/release.rake b/task/release.rake index 65283f0750..be0241bffb 100644 --- a/task/release.rake +++ b/task/release.rake @@ -144,10 +144,21 @@ namespace :release do end desc "Prepare a patch release with the PRs from master in the patch milestone" - task :prepare_patch do - version = bundler_spec.version.to_s + task :prepare_patch, :version do |_t, args| + version = args.version + + version ||= begin + version = bundler_spec.version + segments = version.segments + if segments.last.is_a?(String) + segments << "1" + else + segments[-1] += 1 + end + segments.join(".") + end - puts "Cherry-picking PRs milestoned for #{version} into the stable branch..." + puts "Cherry-picking PRs milestoned for #{version} (currently #{bundler_spec.version}) into the stable branch..." milestones = gh_api_request(:path => "repos/bundler/bundler/milestones?state=open") unless patch_milestone = milestones.find {|m| m["title"] == version } @@ -173,6 +184,15 @@ namespace :release do warn "Opening a new shell to fix the cherry-pick errors" abort unless system("zsh") end + + version_file = "lib/bundler/version.rb" + version_contents = File.read(version_file) + unless version_contents.sub!(/^(\s*VERSION = )"#{Gem::Version::VERSION_PATTERN}"/, "\\1#{version.to_s.dump}") + abort "failed to update #{version_file}, is it in the expected format?" + end + File.open(version_file, "w") {|f| f.write(version_contents) } + + sh("git", "commit", "-am", "Version #{version}") end desc "Open all PRs that have not been included in a stable release" -- cgit v1.2.1