Merge pull request #11276 from scpeters/release_notes_fix_blank_link
release_notes: append #PR to markdown link text
This commit is contained in:
commit
c92a40a751
@ -19,8 +19,13 @@ module ReleaseNotes
|
|||||||
).lines.grep(/Merge pull request/)
|
).lines.grep(/Merge pull request/)
|
||||||
|
|
||||||
log_output.map! do |s|
|
log_output.map! do |s|
|
||||||
s.gsub(%r{.*Merge pull request #(\d+) from ([^/]+)/[^>]*(>>)*},
|
matches = s.match(%r{.*Merge pull request #(?<pr>\d+) from (?<user>[^/]+)/[^>]*>> - (?<body>.*)})
|
||||||
"https://github.com/Homebrew/brew/pull/\\1 (@\\2)")
|
body = if matches[:body].empty?
|
||||||
|
s.gsub(/.*(Merge pull request .*) >> - .*/, "\\1").chomp
|
||||||
|
else
|
||||||
|
matches[:body]
|
||||||
|
end
|
||||||
|
"https://github.com/Homebrew/brew/pull/#{matches[:pr]} (@#{matches[:user]}) - #{body}\n"
|
||||||
end
|
end
|
||||||
|
|
||||||
if markdown
|
if markdown
|
||||||
|
@ -12,12 +12,15 @@ describe ReleaseNotes do
|
|||||||
system "git", "commit", "--allow-empty", "-m", "Merge pull request #1 from Homebrew/fix", "-m", "Do something"
|
system "git", "commit", "--allow-empty", "-m", "Merge pull request #1 from Homebrew/fix", "-m", "Do something"
|
||||||
system "git", "commit", "--allow-empty", "-m", "make a change"
|
system "git", "commit", "--allow-empty", "-m", "make a change"
|
||||||
system "git", "commit", "--allow-empty", "-m", "Merge pull request #2 from User/fix", "-m", "Do something else"
|
system "git", "commit", "--allow-empty", "-m", "Merge pull request #2 from User/fix", "-m", "Do something else"
|
||||||
|
system "git", "commit", "--allow-empty", "-m", "another change"
|
||||||
|
system "git", "commit", "--allow-empty", "-m", "Merge pull request #3 from User/another_change"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe ".generate_release_notes" do
|
describe ".generate_release_notes" do
|
||||||
it "generates release notes" do
|
it "generates release notes" do
|
||||||
expect(described_class.generate_release_notes("release-notes-testing", "HEAD")).to eq <<~NOTES
|
expect(described_class.generate_release_notes("release-notes-testing", "HEAD")).to eq <<~NOTES
|
||||||
|
https://github.com/Homebrew/brew/pull/3 (@User) - Merge pull request #3 from User/another_change
|
||||||
https://github.com/Homebrew/brew/pull/2 (@User) - Do something else
|
https://github.com/Homebrew/brew/pull/2 (@User) - Do something else
|
||||||
https://github.com/Homebrew/brew/pull/1 (@Homebrew) - Do something
|
https://github.com/Homebrew/brew/pull/1 (@Homebrew) - Do something
|
||||||
NOTES
|
NOTES
|
||||||
@ -25,6 +28,7 @@ describe ReleaseNotes do
|
|||||||
|
|
||||||
it "generates markdown release notes" do
|
it "generates markdown release notes" do
|
||||||
expect(described_class.generate_release_notes("release-notes-testing", "HEAD", markdown: true)).to eq <<~NOTES
|
expect(described_class.generate_release_notes("release-notes-testing", "HEAD", markdown: true)).to eq <<~NOTES
|
||||||
|
- [Merge pull request #3 from User/another_change](https://github.com/Homebrew/brew/pull/3) (@User)
|
||||||
- [Do something else](https://github.com/Homebrew/brew/pull/2) (@User)
|
- [Do something else](https://github.com/Homebrew/brew/pull/2) (@User)
|
||||||
- [Do something](https://github.com/Homebrew/brew/pull/1) (@Homebrew)
|
- [Do something](https://github.com/Homebrew/brew/pull/1) (@Homebrew)
|
||||||
NOTES
|
NOTES
|
||||||
|
Loading…
x
Reference in New Issue
Block a user