summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2017-07-17 11:21:01 -0500
committerSamuel Giddins <segiddins@segiddins.me>2017-07-17 11:21:01 -0500
commit577c101bc40e11df10789d1865530ef78afbbf47 (patch)
tree1bb89a589d77b08fdc09f301bf510b9be6d2d360
parent51a231ff204280547f04041afb36ea37b1bba490 (diff)
downloadbundler-seg-release-patch-change-version-after-checkout.tar.gz
[Rakefile] In a patch release, change version after checkoutseg-release-patch-change-version-after-checkout
-rw-r--r--task/release.rake10
1 files changed, 5 insertions, 5 deletions
diff --git a/task/release.rake b/task/release.rake
index 8feaec3ae4..401842ba47 100644
--- a/task/release.rake
+++ b/task/release.rake
@@ -68,6 +68,11 @@ namespace :release do
end
prs.compact!
+ BUNDLER_SPEC.version = version
+
+ branch = version.split(".", 3)[0, 2].push("stable").join("-")
+ sh("git", "checkout", branch)
+
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}")
@@ -75,11 +80,6 @@ namespace :release do
end
File.open(version_file, "w") {|f| f.write(version_contents) }
- BUNDLER_SPEC.version = version
-
- branch = version.split(".", 3)[0, 2].push("stable").join("-")
- sh("git", "checkout", branch)
-
commits = `git log --oneline origin/master --`.split("\n").map {|l| l.split(/\s/, 2) }.reverse
commits.select! {|_sha, message| message =~ /(Auto merge of|Merge pull request) ##{Regexp.union(*prs)}/ }