From 139f90df97a103ecfad84ff517f98b81363e40f0 Mon Sep 17 00:00:00 2001 From: Sean Molenaar Date: Tue, 7 Mar 2023 19:41:40 +0100 Subject: [PATCH 1/5] bump-formula-pr: add release notes if found --- Library/Homebrew/dev-cmd/bump-formula-pr.rb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Library/Homebrew/dev-cmd/bump-formula-pr.rb b/Library/Homebrew/dev-cmd/bump-formula-pr.rb index 2d480cc0bf..3626618b95 100644 --- a/Library/Homebrew/dev-cmd/bump-formula-pr.rb +++ b/Library/Homebrew/dev-cmd/bump-formula-pr.rb @@ -346,6 +346,24 @@ module Homebrew EOS end + if new_url =~ %r{^https://github.com/([\w-]+)/([\w-]+)/archive/refs/tags/(v?[.0-9]*)\.tar} + owner = Regexp.last_match(1) + repo = Regexp.last_match(2) + tag = Regexp.last_match(3) + github_release_data = begin + GitHub::API.open_rest("#{GitHub::API_URL}/repos/#{owner}/#{repo}/releases/tags/#{tag}") + rescue GitHub::API::HTTPNotFoundError + nil + end + + pr_message += <<~EOS if github_release_data.present? +
+ #{github_release_data["prerelease"] ? "pre" : ""}release notes + #{github_release_data["body"]} +
+ EOS + end + pr_info = { sourcefile_path: formula.path, old_contents: old_contents, From 8532bb23cc2d3e0ef6fec11a285ff193dde35b5c Mon Sep 17 00:00:00 2001 From: Sean Molenaar Date: Wed, 8 Mar 2023 13:58:45 +0100 Subject: [PATCH 2/5] Update Library/Homebrew/dev-cmd/bump-formula-pr.rb Co-authored-by: Mike McQuaid --- Library/Homebrew/dev-cmd/bump-formula-pr.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Library/Homebrew/dev-cmd/bump-formula-pr.rb b/Library/Homebrew/dev-cmd/bump-formula-pr.rb index 3626618b95..d997d41529 100644 --- a/Library/Homebrew/dev-cmd/bump-formula-pr.rb +++ b/Library/Homebrew/dev-cmd/bump-formula-pr.rb @@ -353,6 +353,7 @@ module Homebrew github_release_data = begin GitHub::API.open_rest("#{GitHub::API_URL}/repos/#{owner}/#{repo}/releases/tags/#{tag}") rescue GitHub::API::HTTPNotFoundError + # If this is a 404: we can't do anything. nil end From 048ed5d683b7f1d8df8107245c226e8185d32d9f Mon Sep 17 00:00:00 2001 From: Sean Molenaar Date: Wed, 8 Mar 2023 13:59:14 +0100 Subject: [PATCH 3/5] Update Library/Homebrew/dev-cmd/bump-formula-pr.rb Co-authored-by: Mike McQuaid --- Library/Homebrew/dev-cmd/bump-formula-pr.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/bump-formula-pr.rb b/Library/Homebrew/dev-cmd/bump-formula-pr.rb index d997d41529..e3ee26291c 100644 --- a/Library/Homebrew/dev-cmd/bump-formula-pr.rb +++ b/Library/Homebrew/dev-cmd/bump-formula-pr.rb @@ -346,7 +346,7 @@ module Homebrew EOS end - if new_url =~ %r{^https://github.com/([\w-]+)/([\w-]+)/archive/refs/tags/(v?[.0-9]*)\.tar} + if new_url =~ %r{^https://github\.com/([\w-]+)/([\w-]+)/archive/refs/tags/(v?[.0-9]+)\.tar\.} owner = Regexp.last_match(1) repo = Regexp.last_match(2) tag = Regexp.last_match(3) From 9bd567aab959f2c414866d6862d734b04d9b6a51 Mon Sep 17 00:00:00 2001 From: Sean Molenaar Date: Wed, 8 Mar 2023 14:04:28 +0100 Subject: [PATCH 4/5] Update Library/Homebrew/dev-cmd/bump-formula-pr.rb Co-authored-by: Mike McQuaid --- Library/Homebrew/dev-cmd/bump-formula-pr.rb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/dev-cmd/bump-formula-pr.rb b/Library/Homebrew/dev-cmd/bump-formula-pr.rb index e3ee26291c..57d078f3a2 100644 --- a/Library/Homebrew/dev-cmd/bump-formula-pr.rb +++ b/Library/Homebrew/dev-cmd/bump-formula-pr.rb @@ -357,12 +357,14 @@ module Homebrew nil end - pr_message += <<~EOS if github_release_data.present? -
- #{github_release_data["prerelease"] ? "pre" : ""}release notes - #{github_release_data["body"]} -
- EOS + pr_message += if github_release_data.present? + pre = "pre" if github_release_data["prerelease"].present? + <<~XML +
+ #{pre}release notes + #{github_release_data["body"]} +
+ XML end pr_info = { From 2f32da0455e39c3c5640912429b03c0b9c188071 Mon Sep 17 00:00:00 2001 From: Sean Molenaar Date: Wed, 8 Mar 2023 14:28:34 +0100 Subject: [PATCH 5/5] fix syntax --- Library/Homebrew/dev-cmd/bump-formula-pr.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/dev-cmd/bump-formula-pr.rb b/Library/Homebrew/dev-cmd/bump-formula-pr.rb index 57d078f3a2..f7e94e5e23 100644 --- a/Library/Homebrew/dev-cmd/bump-formula-pr.rb +++ b/Library/Homebrew/dev-cmd/bump-formula-pr.rb @@ -357,14 +357,15 @@ module Homebrew nil end - pr_message += if github_release_data.present? + if github_release_data.present? pre = "pre" if github_release_data["prerelease"].present? - <<~XML + pr_message += <<~XML
#{pre}release notes #{github_release_data["body"]}
XML + end end pr_info = {