mirror of
https://github.com/okxlin/appstore.git
synced 2026-11-22 08:00:30 +00:00
Add VoceChat v0.5.41 version packages (#9306)
This commit is contained in:
@@ -15,6 +15,20 @@ from renovate_app_version import image_tag, load_yaml_text, services
|
||||
VERSION_PREFIX_RE = re.compile(r"^[vV]?(\d+(?:\.\d+)*)(.*)$")
|
||||
PRERELEASE_RE = re.compile(r"(?:^|[-.])(?:alpha|beta|rc|pre|preview|dev|snapshot|nightly)(?:[-.+]|\d|$)", re.IGNORECASE)
|
||||
ROLLING_VERSIONS = {"latest", "stable"}
|
||||
ARCH_SUFFIXES = (
|
||||
"-aarch64",
|
||||
"-arm64",
|
||||
"-armv8",
|
||||
"-armv7",
|
||||
"-armv6",
|
||||
"-armhf",
|
||||
"-amd64",
|
||||
"-x86_64",
|
||||
"-ppc64le",
|
||||
"-riscv64",
|
||||
"-s390x",
|
||||
"-386",
|
||||
)
|
||||
|
||||
|
||||
def parse_compose_path(raw_path: str) -> tuple[str, str]:
|
||||
@@ -104,6 +118,14 @@ def version_order_key(tag: str) -> tuple[tuple[int, ...], int]:
|
||||
return core, 0 if is_prerelease else 1
|
||||
|
||||
|
||||
def architecture_lane(version: str) -> str:
|
||||
match = VERSION_PREFIX_RE.fullmatch(version.strip())
|
||||
if not match:
|
||||
return ""
|
||||
suffix = match.group(2).lower()
|
||||
return next((arch for arch in ARCH_SUFFIXES if suffix.endswith(arch)), "")
|
||||
|
||||
|
||||
def select_sources(
|
||||
paths: list[str],
|
||||
base_ref: str,
|
||||
@@ -153,15 +175,24 @@ def select_sources(
|
||||
ranked.append((rank, path, old_tag, new_tag))
|
||||
if not ranked:
|
||||
continue
|
||||
target_tags = {item[3] for item in ranked}
|
||||
if len(target_tags) != 1:
|
||||
raise ValueError(f"{app}: changed source Compose files target different image tags")
|
||||
highest = max(item[0] for item in ranked)
|
||||
winners = [item for item in ranked if item[0] == highest]
|
||||
if len(winners) != 1:
|
||||
detail = ", ".join(f"{path}={old_tag}" for _, path, old_tag, _ in winners)
|
||||
raise ValueError(f"{app}: ambiguous newest source Compose files: {detail}")
|
||||
selected.append(winners[0][1])
|
||||
target_versions = {version_order_key(item[3]) for item in ranked}
|
||||
if len(target_versions) != 1:
|
||||
raise ValueError(f"{app}: changed source Compose files target different version cores")
|
||||
lanes: dict[str, list[tuple[tuple[tuple[int, ...], int], str, str, str]]] = {}
|
||||
for item in ranked:
|
||||
_, directory_version = parse_compose_path(item[1])
|
||||
lanes.setdefault(architecture_lane(directory_version), []).append(item)
|
||||
for lane in sorted(lanes):
|
||||
lane_items = lanes[lane]
|
||||
lane_tags = {item[3] for item in lane_items}
|
||||
if len(lane_tags) != 1:
|
||||
raise ValueError(f"{app}: architecture lane {lane or '<default>'} targets different image tags")
|
||||
highest = max(item[0] for item in lane_items)
|
||||
winners = [item for item in lane_items if item[0] == highest]
|
||||
if len(winners) != 1:
|
||||
detail = ", ".join(f"{path}={old_tag}" for _, path, old_tag, _ in winners)
|
||||
raise ValueError(f"{app}: ambiguous newest source Compose files: {detail}")
|
||||
selected.append(winners[0][1])
|
||||
return selected
|
||||
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@ import json
|
||||
import os
|
||||
import pathlib
|
||||
import re
|
||||
import shutil
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
@@ -266,6 +267,132 @@ class RenovateAppVersionTests(unittest.TestCase):
|
||||
output_file.read_bytes().decode("utf-8").rstrip("\0").split("\0"),
|
||||
)
|
||||
|
||||
def test_source_selector_keeps_architecture_version_tracks(self):
|
||||
with tempfile.TemporaryDirectory(prefix="renovate-source-architectures-") as tmp:
|
||||
repo = pathlib.Path(tmp)
|
||||
versions = {
|
||||
"apps/vocechat/0.5.40/docker-compose.yml": "privoce/vocechat-server:v0.5.40",
|
||||
"apps/vocechat/0.5.40-arm64/docker-compose.yml": "privoce/vocechat-server:v0.5.40-arm64",
|
||||
}
|
||||
for path, image in versions.items():
|
||||
compose_path = repo / path
|
||||
compose_path.parent.mkdir(parents=True, exist_ok=True)
|
||||
compose_path.write_text(
|
||||
f"services:\n vocechat:\n image: {image}\n",
|
||||
encoding="utf-8",
|
||||
)
|
||||
subprocess.run(["git", "init", "-q"], cwd=repo, check=True)
|
||||
subprocess.run(["git", "config", "user.email", "test@example.com"], cwd=repo, check=True)
|
||||
subprocess.run(["git", "config", "user.name", "Test User"], cwd=repo, check=True)
|
||||
subprocess.run(["git", "add", "apps"], cwd=repo, check=True)
|
||||
subprocess.run(["git", "commit", "-qm", "add architecture sources"], cwd=repo, check=True)
|
||||
base_ref = subprocess.run(
|
||||
["git", "rev-parse", "HEAD"], cwd=repo, check=True, text=True, capture_output=True
|
||||
).stdout.strip()
|
||||
for path, image in versions.items():
|
||||
compose_path = repo / path
|
||||
target = image.replace("0.5.40", "0.5.41")
|
||||
compose_path.write_text(
|
||||
compose_path.read_text(encoding="utf-8").replace(image, target),
|
||||
encoding="utf-8",
|
||||
)
|
||||
subprocess.run(["git", "add", "apps"], cwd=repo, check=True)
|
||||
subprocess.run(["git", "commit", "-qm", "update architecture images"], cwd=repo, check=True)
|
||||
head_ref = subprocess.run(
|
||||
["git", "rev-parse", "HEAD"], cwd=repo, check=True, text=True, capture_output=True
|
||||
).stdout.strip()
|
||||
|
||||
changed_file_list = repo / "changed-files.zlist"
|
||||
changed_file_list.write_bytes(
|
||||
b"\0".join(path.encode("utf-8") for path in versions) + b"\0"
|
||||
)
|
||||
policy_file = repo / "policy.json"
|
||||
policy_file.write_text("{}\n", encoding="utf-8")
|
||||
output_file = repo / "selected.zlist"
|
||||
script = REPO_ROOT / ".github" / "scripts" / "renovate_app_version_sources.py"
|
||||
result = subprocess.run(
|
||||
[
|
||||
sys.executable,
|
||||
str(script),
|
||||
"--base-ref",
|
||||
base_ref,
|
||||
"--head-ref",
|
||||
head_ref,
|
||||
"--changed-files",
|
||||
str(changed_file_list),
|
||||
"--policy-file",
|
||||
str(policy_file),
|
||||
"--output-file",
|
||||
str(output_file),
|
||||
],
|
||||
cwd=repo,
|
||||
text=True,
|
||||
capture_output=True,
|
||||
check=False,
|
||||
)
|
||||
|
||||
self.assertEqual(0, result.returncode, result.stderr)
|
||||
self.assertEqual(
|
||||
[
|
||||
"apps/vocechat/0.5.40/docker-compose.yml",
|
||||
"apps/vocechat/0.5.40-arm64/docker-compose.yml",
|
||||
],
|
||||
output_file.read_bytes().decode("utf-8").rstrip("\0").split("\0"),
|
||||
)
|
||||
|
||||
github_dir = repo / ".github"
|
||||
workflows_dir = github_dir / "workflows"
|
||||
scripts_dir = github_dir / "scripts"
|
||||
workflows_dir.mkdir(parents=True)
|
||||
scripts_dir.mkdir()
|
||||
shutil.copyfile(
|
||||
REPO_ROOT / ".github" / "workflows" / "renovate-app-version.sh",
|
||||
workflows_dir / "renovate-app-version.sh",
|
||||
)
|
||||
shutil.copyfile(SCRIPT_PATH, scripts_dir / "renovate_app_version.py")
|
||||
(github_dir / "renovate-primary-services.json").write_text("{}\n", encoding="utf-8")
|
||||
|
||||
for path in output_file.read_bytes().decode("utf-8").rstrip("\0").split("\0"):
|
||||
_, app, version, _ = path.split("/")
|
||||
result = subprocess.run(
|
||||
[
|
||||
"bash",
|
||||
str(workflows_dir / "renovate-app-version.sh"),
|
||||
app,
|
||||
version,
|
||||
path,
|
||||
base_ref,
|
||||
],
|
||||
cwd=repo,
|
||||
text=True,
|
||||
capture_output=True,
|
||||
check=False,
|
||||
)
|
||||
self.assertEqual(0, result.returncode, result.stderr)
|
||||
|
||||
standard_target = yaml.safe_load(
|
||||
(repo / "apps/vocechat/0.5.41/docker-compose.yml").read_text(encoding="utf-8")
|
||||
)
|
||||
arm64_target = yaml.safe_load(
|
||||
(repo / "apps/vocechat/0.5.41-arm64/docker-compose.yml").read_text(encoding="utf-8")
|
||||
)
|
||||
self.assertEqual(
|
||||
"privoce/vocechat-server:v0.5.41",
|
||||
standard_target["services"]["vocechat"]["image"],
|
||||
)
|
||||
self.assertEqual(
|
||||
"privoce/vocechat-server:v0.5.41-arm64",
|
||||
arm64_target["services"]["vocechat"]["image"],
|
||||
)
|
||||
self.assertIn(
|
||||
"image: privoce/vocechat-server:v0.5.40\n",
|
||||
(repo / "apps/vocechat/0.5.40/docker-compose.yml").read_text(encoding="utf-8"),
|
||||
)
|
||||
self.assertIn(
|
||||
"image: privoce/vocechat-server:v0.5.40-arm64\n",
|
||||
(repo / "apps/vocechat/0.5.40-arm64/docker-compose.yml").read_text(encoding="utf-8"),
|
||||
)
|
||||
|
||||
def test_source_selector_ignores_base_only_non_compose_paths(self):
|
||||
with tempfile.TemporaryDirectory(prefix="renovate-source-base-only-") as tmp:
|
||||
repo = pathlib.Path(tmp)
|
||||
|
||||
Reference in New Issue
Block a user