diff options
| author | Bundlerbot <bot@bundler.io> | 2018-10-10 05:42:58 +0000 |
|---|---|---|
| committer | Bundlerbot <bot@bundler.io> | 2018-10-10 05:42:58 +0000 |
| commit | 0f0dbb03bf95e6dccb5d1e033ec41941beb63a5a (patch) | |
| tree | 5bd188d532dfaed61e22339552079f4e8cb5bd6d | |
| parent | 477115c0699c89a940171c4911dbc2b060054f84 (diff) | |
| parent | 2f010d642cadf1def71eba98a74cdd543ae40d71 (diff) | |
| download | bundler-0f0dbb03bf95e6dccb5d1e033ec41941beb63a5a.tar.gz | |
Merge #6719
6719: Update for new bors merge commit message r=colby-swandale a=segiddins
### What was the end-user problem that led to this PR?
The problem was andre updated @bundlerbot and it makes merges with a new message now
### What was your diagnosis of the problem?
My diagnosis was the merge message had changed
### What is your fix for the problem, implemented in this PR?
My fix update a regexp or two
Co-authored-by: Samuel Giddins <segiddins@segiddins.me>
| -rw-r--r-- | task/release.rake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/task/release.rake b/task/release.rake index e90eec0bef..3a48c1d255 100644 --- a/task/release.rake +++ b/task/release.rake @@ -160,7 +160,7 @@ namespace :release do File.open(version_file, "w") {|f| f.write(version_contents) } 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)}/ } + commits.select! {|_sha, message| message =~ /(Auto merge of|Merge pull request|Merge) ##{Regexp.union(*prs)}/ } abort "Could not find commits for all PRs" unless commits.size == prs.size @@ -187,7 +187,7 @@ namespace :release do task :open_unreleased_prs do def prs(on = "master") commits = `git log --oneline origin/#{on} --`.split("\n") - commits.reverse_each.map {|c| c =~ /(Auto merge of|Merge pull request) #(\d+)/ && $2 }.compact + commits.reverse_each.map {|c| c =~ /(Auto merge of|Merge pull request|Merge) #(\d+)/ && $2 }.compact end last_stable = `git ls-remote origin`.split("\n").map {|r| r =~ %r{refs/tags/v([\d.]+)$} && $1 }.compact.map {|v| Gem::Version.create(v) }.max |