summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBundlerbot <bot@bundler.io>2019-09-17 08:43:33 +0000
committerDavid Rodríguez <deivid.rodriguez@riseup.net>2019-11-07 16:41:29 +0100
commit03d4fe2b1898261c598a6f20f15645c6d3a55372 (patch)
treea8b94cd8c6c4d602af7e694ec9c2c05804555cfb
parentc86b21c24424eaa26c3fc073834594c1f3d31cc3 (diff)
downloadbundler-03d4fe2b1898261c598a6f20f15645c6d3a55372.tar.gz
Merge #7358
7358: More release fixes r=deivid-rodriguez a=deivid-rodriguez ### What was the end-user problem that led to this PR? I just released [2.1.0.pre.2](https://rubygems.org/gems/bundler/versions/2.1.0.pre.2). It went smoother than 2.1.0.pre.1, but I still got an issue where I unintentionally pushed a release named "v" to github releases. ### What was your diagnosis of the problem? My diagnosis was that the release task by default should use the version in the gemspec for the `release:github` tasks. ### What is your fix for the problem, implemented in this PR? My fix adds that fallback. ### Why did you choose this fix out of the possible options? I chose this fix because it does what the user expects when the task is not passed any arguments. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net> (cherry picked from commit ebe0b853d8f2ac93f9c69768ee6af2c18fbc9d87)
-rw-r--r--CHANGELOG.md2
-rw-r--r--task/release.rake2
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 068a39445c..6a2610f41b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 2.1.0.pre.2
+## 2.1.0.pre.2 (September 15, 2019)
Bugfixes:
diff --git a/task/release.rake b/task/release.rake
index be0241bffb..cd66ff755d 100644
--- a/task/release.rake
+++ b/task/release.rake
@@ -131,7 +131,7 @@ namespace :release do
desc "Push the release to Github releases"
task :github, :version do |_t, args|
- version = Gem::Version.new(args.version)
+ version = Gem::Version.new(args.version || bundler_spec.version)
tag = "v#{version}"
gh_api_post :path => "/repos/bundler/bundler/releases",