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

[wip] Resolve HEAD to a commit right away

Browse source
This commit is contained in:
Alexandre Aubin 2019-08-19 23:55:38 +02:00
parent dc55c9bf8a
commit d18c464855
1 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
list_builder.py
View file

@ -181,32 +181,40 @@ for app, info in apps_list.items():
previous_featured = already_built_file.get(app, {}).get("featured") previous_featured = already_built_file.get(app, {}).get("featured")
previous_high_quality = already_built_file.get(app, {}).get("high_quality") previous_high_quality = already_built_file.get(app, {}).get("high_quality")
if forge_type == "github" and app_rev == "HEAD": if app_rev == "HEAD":
app_rev = subprocess.check_output(["git", "ls-remote", app_url, "HEAD"]).split()[0]
if not re.match(r"^[0-9a-f]+$", app_rev):
error("Revision for %s did not match expected regex" % app)
continue
if previous_rev is None: if previous_rev is None:
previous_rev = 'HEAD' previous_rev = 'HEAD'
url = "https://api.github.com/repos/{}/{}/git/refs/heads/{}".format(owner, repo, app_branch) # If this is a github repo, we are able to optimize things a bit by looking at the diff
head = get_json(url) # and not actually updating the app if only README or other not-so-important files were edited
app_rev = head["object"]["sha"] if forge_type == "github":
url = "https://api.github.com/repos/{}/{}/compare/{}...{}".format(owner, repo, previous_rev, app_branch) url = "https://api.github.com/repos/{}/{}/git/refs/heads/{}".format(owner, repo, app_branch)
diff = get_json(url) head = get_json(url)
app_rev = head["object"]["sha"]
if not diff or not diff["commits"]: url = "https://api.github.com/repos/{}/{}/compare/{}...{}".format(owner, repo, previous_rev, app_branch)
app_rev = previous_rev if previous_rev != 'HEAD' else app_rev diff = get_json(url)
else:
# Only if those files got updated, do we want to update the
# commit (otherwise that would trigger an unecessary upgrade)
ignore_files = [ "README.md", "LICENSE", ".gitignore", "check_process", ".travis.yml" ]
diff_files = [ f for f in diff["files"] if f["filename"] not in ignore_files ]
if diff_files: if not diff or not diff["commits"]:
print("This app points to HEAD and significant changes where found between HEAD and previous commit")
app_rev = diff["commits"][-1]["sha"]
else:
print("This app points to HEAD but no significant changes where found compared to HEAD, so keeping the previous commit")
app_rev = previous_rev if previous_rev != 'HEAD' else app_rev app_rev = previous_rev if previous_rev != 'HEAD' else app_rev
else:
# Only if those files got updated, do we want to update the
# commit (otherwise that would trigger an unecessary upgrade)
ignore_files = [ "README.md", "LICENSE", ".gitignore", "check_process", ".travis.yml" ]
diff_files = [ f for f in diff["files"] if f["filename"] not in ignore_files ]
if diff_files:
print("This app points to HEAD and significant changes where found between HEAD and previous commit")
app_rev = diff["commits"][-1]["sha"]
else:
print("This app points to HEAD but no significant changes where found compared to HEAD, so keeping the previous commit")
app_rev = previous_rev if previous_rev != 'HEAD' else app_rev
print("Previous commit : %s" % previous_rev) print("Previous commit : %s" % previous_rev)
print("Current commit : %s" % app_rev) print("Current commit : %s" % app_rev)