Merge branch 'main' into fix/steam-sleep-resume-black-screen

This commit is contained in:
Kurt Himebauch authored and GitHub committed 2026-10-03 14:18:44 -04:00
commit 6357543b44
7 files changed
+362 -6

No files matched your search

+51 -3
View File
@@ -229,6 +229,50 @@ def release_entry(
}
def preview_history_entry(release: dict, preview: dict, variants: list[tuple[str, str]]):
"""Return compact history metadata for one complete, signed main build."""
tag = release.get("tag_name") or ""
tag_match = MAIN_TAG.fullmatch(tag)
commit = (preview.get("commit") or "").lower()
expected_packages = {package for package, _ in variants}
apks = preview.get("apks") or {}
if (
release.get("draft")
or not release.get("prerelease")
or not tag_match
or not re.fullmatch(r"[0-9a-f]{40}", commit)
or not commit.startswith(tag_match.group(1))
or set(apks) != expected_packages
or any(
not SHA256.fullmatch((apk.get("sha256") or "").lower())
or not SHA256.fullmatch((apk.get("signerSha256") or "").lower())
for apk in apks.values()
)
):
return None
return {
"commit": commit,
"title": preview["title"],
"summary": preview["summary"][:400],
"publishedAt": preview["publishedAt"],
}
def recent_previews(entries: list[dict], limit: int = 10) -> list[dict]:
"""Keep the newest distinct Preview commits, newest first."""
result = []
seen = set()
for entry in sorted(entries, key=lambda item: item["publishedAt"], reverse=True):
commit = entry["commit"].lower()
if commit in seen:
continue
seen.add(commit)
result.append({**entry, "commit": commit})
if len(result) >= limit:
break
return result
def release_body_value(body: str, key: str):
match = re.search(rf"(?mi)^\s*{re.escape(key)}:\s*`?([^\s`]+)", body or "")
return match.group(1) if match else None
@@ -276,6 +320,7 @@ def build_catalog(source: GitHub, ci: GitHub, source_repo: str, ci_repo: str) ->
releases = ci.get(f"/repos/{ci_repo}/releases?per_page=100")
previews = []
preview_history = []
tests = []
for release in releases:
if release.get("draft"):
@@ -291,9 +336,11 @@ def build_catalog(source: GitHub, ci: GitHub, source_repo: str, ci_repo: str) ->
except ApiError:
continue
title, summary = ci_description(release)
previews.append(
release_entry(release, commit, 0, None, code, variants, signer, title, summary)
)
preview = release_entry(release, commit, 0, None, code, variants, signer, title, summary)
previews.append(preview)
history_entry = preview_history_entry(release, preview, variants)
if history_entry:
preview_history.append(history_entry)
continue
pr_match = PR_TAG.fullmatch(tag)
@@ -356,6 +403,7 @@ def build_catalog(source: GitHub, ci: GitHub, source_repo: str, ci_repo: str) ->
"generatedAt": int(time.time() * 1000),
"stable": stable,
"preview": previews[0] if previews else None,
"recentPreviews": recent_previews(preview_history),
"tests": tests,
}
+49
View File
@@ -6,6 +6,8 @@ from tools.release.update_catalog import (
parse_gradle,
parse_variants,
published_millis,
preview_history_entry,
recent_previews,
release_body_value,
stable_app_release,
)
@@ -87,6 +89,53 @@ pubg com.tencent.ig -pubg
published_millis(release, prefer_updated=True),
)
def test_preview_history_keeps_only_complete_signed_main_releases(self):
variants = [("com.droiddeck.launcher", ""), ("com.example.variant", "-variant")]
commit = "a" * 40
entry = {
"commit": commit,
"title": "Fix Steam resume",
"summary": "Steam stays open after resuming.",
"publishedAt": 123,
"apks": {
package: {"sha256": "a" * 64, "signerSha256": "b" * 64}
for package, _ in variants
},
}
release = {"tag_name": "main-aaaaaaa", "draft": False, "prerelease": True}
self.assertEqual(
{
"commit": commit,
"title": "Fix Steam resume",
"summary": "Steam stays open after resuming.",
"publishedAt": 123,
},
preview_history_entry(release, entry, variants),
)
for invalid_release in (
{**release, "draft": True},
{**release, "prerelease": False},
{**release, "tag_name": "pr-42"},
):
self.assertIsNone(preview_history_entry(invalid_release, entry, variants))
self.assertIsNone(preview_history_entry(release, {**entry, "commit": "a" * 12}, variants))
self.assertIsNone(preview_history_entry(release, {**entry, "apks": {"com.droiddeck.launcher": {}}}, variants))
unsigned = {**entry, "apks": {package: {"sha256": "a" * 64} for package, _ in variants}}
self.assertIsNone(preview_history_entry(release, unsigned, variants))
def test_preview_history_is_newest_first_deduplicated_and_limited(self):
entries = [
{"commit": f"{i:040x}", "title": str(i), "summary": "", "publishedAt": i}
for i in range(12)
]
entries.append({**entries[-1], "title": "duplicate", "publishedAt": 99})
recent = recent_previews(entries)
self.assertEqual(10, len(recent))
self.assertEqual("duplicate", recent[0]["title"])
self.assertEqual("000000000000000000000000000000000000000a", recent[1]["commit"])
self.assertEqual(1, len([item for item in recent if item["commit"].endswith("000b")]))
def test_stable_is_the_newest_app_release_not_github_latest(self):
def release(tag, at, *assets, **flags):
return {"tag_name": tag, "published_at": at, "assets": [{"name": a} for a in assets], **flags}