mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

build: clean up upload-index-json error handling (#42665)

Browse source 
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
trop[bot] 2024-06-26 21:36:11 +02:00 committed by GitHub
parent 0e84572a8f
commit 8454fc2858
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 36 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
script/release/uploaders/upload-index-json.py
View file

@ -15,8 +15,7 @@ OUT_DIR = get_out_dir()
BASE_URL = 'https://electron-metadumper.herokuapp.com/?version=' BASE_URL = 'https://electron-metadumper.herokuapp.com/?version='
version = sys.argv[1] AUTH_TOKEN = os.getenv('META_DUMPER_AUTH_HEADER')
authToken = os.getenv('META_DUMPER_AUTH_HEADER')
def is_json(myjson): def is_json(myjson):
try: try:
@ -25,11 +24,12 @@ def is_json(myjson):
return False return False
return True return True
def get_content(retry_count = 5): def get_content(version, retry_count=5):
for attempt in range(retry_count):
try: try:
request = Request( request = Request(
BASE_URL + version, BASE_URL + version,
headers={"Authorization" : authToken} headers={"Authorization": AUTH_TOKEN}
) )
with urlopen(request) as resp: with urlopen(request) as resp:
@ -37,28 +37,42 @@ def get_content(retry_count = 5):
if is_json(proposed_content): if is_json(proposed_content):
return proposed_content return proposed_content
print("bad attempt")
raise Exception("Failed to fetch valid JSON from the metadumper service") print("Received content is not valid JSON.")
if attempt == retry_count - 1:
return None
except Exception as e: except Exception as e:
if retry_count == 0: print(f"Attempt {attempt + 1} failed: {e}")
raise e if attempt == retry_count - 1:
return get_content(retry_count - 1) return None
if attempt < retry_count - 1:
print("Retrying...")
return None
def main(): def main():
if not authToken or authToken == "": if not AUTH_TOKEN or AUTH_TOKEN == "":
raise Exception("Please set META_DUMPER_AUTH_HEADER") raise Exception("Please set META_DUMPER_AUTH_HEADER")
# Upload the index.json.
if len(sys.argv) < 2 or not sys.argv[1]:
raise Exception("Version is required")
version = sys.argv[1]
with scoped_cwd(ELECTRON_DIR): with scoped_cwd(ELECTRON_DIR):
safe_mkdir(OUT_DIR) safe_mkdir(OUT_DIR)
index_json = os.path.relpath(os.path.join(OUT_DIR, 'index.json')) index_json = os.path.relpath(os.path.join(OUT_DIR, 'index.json'))
new_content = get_content(version)
new_content = get_content() if new_content is None:
raise Exception("Failed to fetch valid JSON after maximum retries.")
with open(index_json, "wb") as f: with open(index_json, "wb") as f:
f.write(new_content) f.write(new_content)
store_artifact(OUT_DIR, 'headers/dist', [index_json]) store_artifact(OUT_DIR, 'headers/dist', [index_json])
if __name__ == '__main__': if __name__ == '__main__':
sys.exit(main()) sys.exit(main())