sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-24 19:42:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: better readability

Browse Source
This commit is contained in:
UdjinM6 2024-09-05 11:49:09 +03:00
parent 9ad537380b
commit 2e8f9f9f08
No known key found for this signature in database
GPG Key ID: 83592BD1400D58D9
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
.github/workflows/handle_potential_conflicts.py vendored
View File

@ -24,8 +24,8 @@ import requests
# need to install via pip # need to install via pip
import hjson import hjson
def get_label(pr_num): def get_pr_json(pr_num):
return requests.get(f'https://api.github.com/repos/dashpay/dash/pulls/{pr_num}').json()['head']['label'] return requests.get(f'https://api.github.com/repos/dashpay/dash/pulls/{pr_num}').json()
def main(): def main():
if len(sys.argv) != 2: if len(sys.argv) != 2:
@ -39,33 +39,33 @@ def main():
our_pr_num = j_input['pull_number'] our_pr_num = j_input['pull_number']
our_pr_label = get_label(our_pr_num) our_pr_label = get_pr_json(our_pr_num)['head']['label']
conflictPrs = j_input['conflictPrs'] conflictPrs = j_input['conflictPrs']
good = [] good = []
bad = [] bad = []
for conflict in conflictPrs: for conflict in conflictPrs:
this_pr_num = conflict['number'] conflict_pr_num = conflict['number']
print(this_pr_num) print(conflict_pr_num)
r = requests.get(f'https://api.github.com/repos/dashpay/dash/pulls/{this_pr_num}') conflict_pr_json = get_pr_json(conflict_pr_num)
print(r.json()['head']['label']) conflict_pr_label = conflict_pr_json['head']['label']
print(conflict_pr_label)
mergable_state = r.json()['mergeable_state'] if conflict_pr_json['mergeable_state'] == "dirty":
if mergable_state == "dirty": print(f'{conflict_pr_num} needs rebase. Skipping conflict check')
print(f'{this_pr_num} needs rebase. Skipping conflict check')
continue continue
if r.json()["draft"]: if conflict_pr_json['draft']:
print(f'{this_pr_num} is a draft. Skipping conflict check') print(f'{conflict_pr_num} is a draft. Skipping conflict check')
continue continue
r = requests.get(f'https://github.com/dashpay/dash/branches/pre_mergeable/{our_pr_label}...{r.json()['head']['label']}') pre_mergeable = requests.get(f'https://github.com/dashpay/dash/branches/pre_mergeable/{our_pr_label}...{conflict_pr_label}')
if "These branches can be automatically merged." in r.text: if "These branches can be automatically merged." in pre_mergeable.text:
good.append(this_pr_num) good.append(conflict_pr_num)
elif "Can’t automatically merge" in r.text: elif "Can’t automatically merge" in pre_mergeable.text:
bad.append(this_pr_num) bad.append(conflict_pr_num)
else: else:
raise Exception("not mergeable or unmergable!") raise Exception("not mergeable or unmergable!")