diff options
| author | Samuel Giddins <segiddins@segiddins.me> | 2018-10-02 20:38:47 -0700 |
|---|---|---|
| committer | Samuel Giddins <segiddins@segiddins.me> | 2018-10-02 20:38:47 -0700 |
| commit | 2f010d642cadf1def71eba98a74cdd543ae40d71 (patch) | |
| tree | d84149667f62d16c515b68d7ab712410c02bc96f | |
| parent | 8c080ff6e7c3ce8fdd237f23eb499b197d56954d (diff) | |
| download | bundler-segiddins/new-bors-merge-commit-message.tar.gz | |
Update for new bors merge commit messagesegiddins/new-bors-merge-commit-message
| -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 |