admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #16751 from Homebrew/no-fork-yes-auth

Browse Source 
utils/github: support `HOMEBREW_GITHUB_API_TOKEN` with `--no-fork`
This commit is contained in:
Mike McQuaid 2024-02-27 08:34:08 +00:00 committed by GitHub
commit 6b6767be21
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Library/Homebrew/utils/github.rb
View File

@ -593,6 +593,13 @@ module GitHub
API.open_rest(url_to("repos", tap_remote_repo, "pulls", pull_request, "files")) API.open_rest(url_to("repos", tap_remote_repo, "pulls", pull_request, "files"))
end end
private_class_method def self.add_auth_token_to_url!(url)
if API.credentials_type == :env_token
url.sub!(%r{^https://github\.com/}, "https://#{API.credentials}@github.com/")
end
url
end
def self.forked_repo_info!(tap_remote_repo, org: nil) def self.forked_repo_info!(tap_remote_repo, org: nil)
response = create_fork(tap_remote_repo, org: org) response = create_fork(tap_remote_repo, org: org)
# GitHub API responds immediately but fork takes a few seconds to be ready. # GitHub API responds immediately but fork takes a few seconds to be ready.
@ -600,11 +607,7 @@ module GitHub
remote_url = if system("git", "config", "--local", "--get-regexp", "remote..*.url", "git@github.com:.*") remote_url = if system("git", "config", "--local", "--get-regexp", "remote..*.url", "git@github.com:.*")
response.fetch("ssh_url") response.fetch("ssh_url")
else else
url = response.fetch("clone_url") add_auth_token_to_url!(response.fetch("clone_url"))
if (api_token = Homebrew::EnvConfig.github_api_token)
url.gsub!(%r{^https://github\.com/}, "https://#{api_token}@github.com/")
end
url
end end
username = response.fetch("owner").fetch("login") username = response.fetch("owner").fetch("login")
[remote_url, username] [remote_url, username]
@ -651,6 +654,7 @@ module GitHub
unless args.commit? unless args.commit?
if args.no_fork? if args.no_fork?
remote_url = Utils.popen_read("git", "remote", "get-url", "--push", "origin").chomp remote_url = Utils.popen_read("git", "remote", "get-url", "--push", "origin").chomp
add_auth_token_to_url!(remote_url)
username = tap.user username = tap.user
else else
begin begin