24
24
25
25
from platforms .common import ReleaseException , run
26
26
from releases import get_version_and_timestamp_from_release
27
+ from releases import get_current_user
27
28
28
29
29
30
def brew (homebrew_dir , command , * run_args , ** run_kwargs ):
@@ -230,7 +231,7 @@ def update_formula_after_bottle(formula_path, sha, target_macos_version_spec):
230
231
logging .info ("Updated formula with new bottle sha" )
231
232
232
233
233
- def push_tap (git_repository , tap_path , version ):
234
+ def push_tap (git_repository , tap_path , version , github_token ):
234
235
"""
235
236
Grab any working directory changes for the tap, clone a new tap repository,
236
237
and push those changes upstream. The original tap path is in a clean state
@@ -243,7 +244,8 @@ def push_tap(git_repository, tap_path, version):
243
244
"""
244
245
logging .info ("Gathering git diff from {}" .format (tap_path ))
245
246
git_diff = run (["git" , "diff" ], tap_path , True ).stdout
246
- git_url = "[email protected] :{}.git" .
format (
git_repository )
247
+ user = get_current_user (github_token )
248
+ git_url = "https://{}:{}@github.com/{}.git" .format (user ["login" ], github_token , git_repository )
247
249
248
250
with tempfile .TemporaryDirectory () as temp_dir :
249
251
logging .info ("Cloning {} into {}" .format (git_url , temp_dir ))
@@ -297,13 +299,13 @@ def audit_tap(homebrew_dir, tap_repository):
297
299
brew (homebrew_dir , ["audit" , brew_target ])
298
300
299
301
300
- def publish_tap_changes (homebrew_dir , tap_repository , version ):
302
+ def publish_tap_changes (homebrew_dir , tap_repository , version , github_token ):
301
303
git_user , git_repo = tap_repository .split ("/" )
302
304
full_git_repo = "{}/homebrew-{}" .format (git_user , git_repo )
303
305
formula_path = get_formula_path (homebrew_dir , tap_repository )
304
306
tap_path = os .path .dirname (formula_path )
305
307
306
- push_tap (full_git_repo , tap_path , version )
308
+ push_tap (full_git_repo , tap_path , version , github_token )
307
309
308
310
309
311
def log_about_manual_tap_push (homebrew_dir , tap_repository ):
0 commit comments