YunoHost/apps
1
0
Fork 0
mirror of https://github.com/YunoHost/apps.git synced 2024-09-03 20:06:07 +02:00
Code Projects Activity

Smol fix to correctly fetch the app_rev idk

Browse source
This commit is contained in:
root 2019-10-08 16:12:18 +00:00
parent b5f08660bc
commit 1495c3c5bd
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
list_builder.py
View file

@ -182,7 +182,7 @@ for app, info in apps_list.items():
previous_high_quality = already_built_file.get(app, {}).get("high_quality") previous_high_quality = already_built_file.get(app, {}).get("high_quality")
if app_rev == "HEAD": if app_rev == "HEAD":
app_rev = subprocess.check_output(["git", "ls-remote", app_url, "HEAD"]).split()[0] app_rev = subprocess.check_output(["git", "ls-remote", app_url, "refs/heads/"+app_branch]).split()[0]
if not re.match(r"^[0-9a-f]+$", app_rev): if not re.match(r"^[0-9a-f]+$", app_rev):
error("Revision for %s did not match expected regex" % app) error("Revision for %s did not match expected regex" % app)
continue continue
@ -192,11 +192,7 @@ for app, info in apps_list.items():
# If this is a github repo, we are able to optimize things a bit by looking at the diff # If this is a github repo, we are able to optimize things a bit by looking at the diff
# and not actually updating the app if only README or other not-so-important files were edited # and not actually updating the app if only README or other not-so-important files were edited
if forge_type == "github": if previous_rev != app_rev and forge_type == "github":
url = "https://api.github.com/repos/{}/{}/git/refs/heads/{}".format(owner, repo, app_branch)
head = get_json(url)
app_rev = head["object"]["sha"]
url = "https://api.github.com/repos/{}/{}/compare/{}...{}".format(owner, repo, previous_rev, app_branch) url = "https://api.github.com/repos/{}/{}/compare/{}...{}".format(owner, repo, previous_rev, app_branch)
diff = get_json(url) diff = get_json(url)