bump-formula-pr: enable same-repo (no-fork) Pull Requests

[maxim-belkin]

• Have you followed the guidelines in our Contributing document?
• Have you checked to ensure there aren't other open Pull Requests for the same change?
• Have you added an explanation of what your changes do and why you'd like us to include them?
• Have you written new tests for your changes? Here's an example.
• Have you successfully run brew style with your changes locally?
• Have you successfully run brew tests with your changes locally?

---

To build bottles with GitHub actions, we need to create PRs from branches that live in the same tap. Here I add --no-fork option that instructs bump-formula-pr to create branch in origin rather than in a forked repo.

Tested at maxim-belkin/homebrew-xorg#581

[MikeMcQuaid]

Change makes sense, just thinking about ways to clean code while we do it.

[MikeMcQuaid]

Maybe this could all be extracted to another function to make use of e.g. early returns?

[issyl0]

This needs a rebase now #6718 has been merged.

[MikeMcQuaid]

Conflicting files

Library/Homebrew/dev-cmd/bump-formula-pr.rb

Just to note this. Should be good to go after that (pending one final review).

[maxim-belkin]

Rebased the branch and it seems to be working as expected.
Tested here: maxim-belkin/homebrew-xorg#588

[MikeMcQuaid]

Thanks again @maxim-belkin!

[dawidd6]

I think you meant @maxim-belkin :)

[MikeMcQuaid]

Oops 😉! Edited!

[dawidd6]

This PR broke current standard workflow with forks. I'll shamelessly paste here the output that @chenrui333 got:

$ brew bump-formula-pr babel --url=https://registry.npmjs.org/@babel/core/-/core-7.7.4.tgz --sha256=3bb9a1d79c68a0c1c41885b86471d306b99efefabb2def80ea3a511d3476f048 --verbose
==> replace /https:\/\/registry\.npmjs\.org\/@babel\/core\/\-\/core\-7\.7\.2\.tgz/ with "https://registry.npmjs.org/@babel/core/-/core-7.7.4.tgz"
==> replace "e2e9745819df1a040265933785536c2b3317661bc635c63e98497e4882ae6a39" with "3bb9a1d79c68a0c1c41885b86471d306b99efefabb2def80ea3a511d3476f048"
/usr/local/bin/brew audit /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/babel.rb
Error: Not Found

It's probably because of this new function: GitHub.check_fork_exists(tap_full_name).

[maxim-belkin]

I see brew audit /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/babel.rb Error: Not Found How is it related to GitHub.check_fork_exists(tap_full_name)?

…

On Sat, Nov 23, 2019 at 07:05 Dawid Dziurla ***@***.***> wrote: This PR broke current standard workflow with forks. I'll shamelessly paste here the output that @chenrui333 <https://github.com/chenrui333> got: $ brew bump-formula-pr babel ***@***.***/core/-/core-7.7.4.tgz --sha256=3bb9a1d79c68a0c1c41885b86471d306b99efefabb2def80ea3a511d3476f048 --verbose ==> replace ***@***.***\/core\/\-\/core\-7\.7\.2\.tgz/ with ***@***.***/core/-/core-7.7.4.tgz" ==> replace "e2e9745819df1a040265933785536c2b3317661bc635c63e98497e4882ae6a39" with "3bb9a1d79c68a0c1c41885b86471d306b99efefabb2def80ea3a511d3476f048" /usr/local/bin/brew audit /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/babel.rb Error: Not Found — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#6723?email_source=notifications&email_token=ADEEAT5IO5DLOGAYZ6Q66SDQVETBNA5CNFSM4JLZWZAKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEE7UYHQ#issuecomment-557796382>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ADEEAT6YRUKVNIOB4EJPLD3QVETBNANCNFSM4JLZWZAA> .

[maxim-belkin]

The only change that should be noticeable after this PR is that now bump-formula-pr will not attempt to push to origin without --no-fork and vice a versa: with --no-fork it will not attempt to create a fork.

@dawidd6 and @chenrui333, could you please post here a repro next time you encounter an error? I see that babel has been updated...

[dawidd6]

The repro is actually pretty simple, try to brew bump-formula-pr anything without --no-fork option passed and the error will appear.

Maybe it has something to do with:

brew/Library/Homebrew/utils/github.rb

Lines 82 to 99 in a1939cf

	def api_credentials
	@api_credentials ||= begin
	if ENV["HOMEBREW_GITHUB_API_TOKEN"]
	ENV["HOMEBREW_GITHUB_API_TOKEN"]
	elsif ENV["HOMEBREW_GITHUB_API_USERNAME"] && ENV["HOMEBREW_GITHUB_API_PASSWORD"]
	[ENV["HOMEBREW_GITHUB_API_PASSWORD"], ENV["HOMEBREW_GITHUB_API_USERNAME"]]
	else
	github_credentials = api_credentials_from_keychain
	github_username = github_credentials[/username=(.+)/, 1]
	github_password = github_credentials[/password=(.+)/, 1]
	if github_username && github_password
	[github_password, github_username]
	else
	[]
	end
	end
	end
	end

This function is used in check_fork_exists function that you introduced in this PR, but I only have HOMEBREW_GITHUB_API_TOKEN set and it seems like that function depends on HOMEBREW_GITHUB_API_USERNAME being set, yet I don't have the need to set it.

Also the new forked_repo_info function is a bit broken (no begin, too few arguments, ...).

[maxim-belkin]

Ah, I think I know what the problem is. I’ll look into it later today.

…

On Sat, Nov 23, 2019 at 16:14 Dawid Dziurla ***@***.***> wrote: The repro is actually pretty simple, try to brew bump-formula-pr anything without --no-fork option passed and the error will appear. Maybe it has something to do with: https://github.com/Homebrew/brew/blob/master/Library/Homebrew/utils/github.rb#L82-L99 This function is used in check_fork_exists(repo) function that you introduced in this PR, but I only have HOMEBREW_GITHUB_API_TOKEN set and it seems like that function depends on HOMEBREW_GITHUB_API_USERNAME being set, yet I don't have the need to set it. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#6723?email_source=notifications&email_token=ADEEAT353V52BC2SZAVCYLDQVGTM5A5CNFSM4JLZWZAKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEE762UA#issuecomment-557837648>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ADEEAT77KX5PKAZYJKOBBU3QVGTM5ANCNFSM4JLZWZAA> .