Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2025-12-06 11:36:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Change auth methods for pushing

Browse Source
This commit is contained in:
Sebastien
2022-11-24 09:07:35 -05:00
parent 0e12f7f887
commit 3144cf5f91
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@@ -90,6 +90,7 @@ RUN : \
&& pip show pygit2 \ && pip show pygit2 \
&& python --version \ && python --version \
&& pip --version \ && pip --version \
&& pip3 install protobuf grpcio-tools \
&& rm -rf $IDF_TOOLS_PATH/dist \ && rm -rf $IDF_TOOLS_PATH/dist \
&& : && :

25
docker/build_tools.py
View File

@@ -517,7 +517,7 @@ class Releases():
print(f'Opening repository from {path}') print(f'Opening repository from {path}')
cls.repo = Repository(path=path) cls.repo = Repository(path=path)
except GitError as ex: except GitError as ex:
print_error(f"Unable to access the repository.\nContent of {path}:\n{NEWLINE_CHAR.join(get_file_list(path, 1))}") print_error(f"Unable to access the repository({ex}).\nContent of {path}:\n{NEWLINE_CHAR.join(get_file_list(path, 1))}")
raise raise
return cls.repo return cls.repo
@@ -844,6 +844,14 @@ def get_changed_items(repo: Repository) -> Dict:
def is_dirty(repo: Repository) -> bool: def is_dirty(repo: Repository) -> bool:
return len(get_changed_items(repo)) > 0 return len(get_changed_items(repo)) > 0
def push_with_method(auth_method:str,token:str,remote: Remote,reference):
success:bool = False
try:
remote.push(reference, callbacks=RemoteCallbacks(pygit2.UserPass(auth_method, token)))
success=True
except Exception as ex:
print_error(f'Error pushing with auth method {auth_method}: {ex}.')
return success
def push_if_change(repo: Repository, token: str, source_path: str, manif_json): def push_if_change(repo: Repository, token: str, source_path: str, manif_json):
if is_dirty(repo): if is_dirty(repo):
@@ -861,15 +869,14 @@ def push_if_change(repo: Repository, token: str, source_path: str, manif_json):
origin: Remote = repo.remotes['origin'] origin: Remote = repo.remotes['origin']
print( print(
f'Pushing commit {format_commit(repo[commit])} to url {origin.url}') f'Pushing commit {format_commit(repo[commit])} to url {origin.url}')
credentials = UserPass(token, 'x-oauth-basic') # passing credentials
remote: Remote = repo.remotes['origin'] remote: Remote = repo.remotes['origin']
# remote.credentials = credentials auth_methods = ['x-access-token','x-oauth-basic']
auth_method = 'x-access-token' for method in auth_methods:
remote.push([reference], callbacks=RemoteCallbacks( if push_with_method('x-access-token', token, remote, [reference]):
pygit2.UserPass(auth_method, token))) print(f'::notice Web installer updated for {format_artifact_from_manifest(manif_json)}')
print( return
f'::notice Web installer updated for {format_artifact_from_manifest(manif_json)}')
raise Exception('Unable to push web installer changes to installer repo')
else: else:
print(f'WARNING: No change found. Skipping update') print(f'WARNING: No change found. Skipping update')