mirror of
https://github.com/okhsunrog/vpnhide.git
synced 2026-07-10 01:28:45 +00:00
Some checks are pending
CI Image / build-push (push) Waiting to run
CI / setup (push) Waiting to run
CI / lint (push) Blocked by required conditions
CI / kmod-activator (push) Blocked by required conditions
CI / kmod (android12-5.10) (push) Blocked by required conditions
CI / kmod (android13-5.10) (push) Blocked by required conditions
CI / kmod (android13-5.15) (push) Blocked by required conditions
CI / kmod (android14-5.15) (push) Blocked by required conditions
CI / kmod (android14-6.1) (push) Blocked by required conditions
CI / kmod (android15-6.6) (push) Blocked by required conditions
CI / kmod (android16-6.12) (push) Blocked by required conditions
CI / kmod-qemu (android12-5.10) (push) Blocked by required conditions
CI / kmod-qemu (android13-5.10) (push) Blocked by required conditions
CI / kmod-qemu (android13-5.15) (push) Blocked by required conditions
CI / kmod-qemu (android14-5.15) (push) Blocked by required conditions
CI / kmod-qemu (android14-6.1) (push) Blocked by required conditions
CI / kmod-qemu (android15-6.6) (push) Blocked by required conditions
CI / kmod-qemu (android16-6.12) (push) Blocked by required conditions
CI / kpm-qemu (android12-5.10) (push) Blocked by required conditions
CI / kpm-qemu (android13-5.10) (push) Blocked by required conditions
CI / kpm-qemu (android13-5.15) (push) Blocked by required conditions
CI / kpm-qemu (android14-5.15) (push) Blocked by required conditions
CI / kpm-qemu (android14-6.1) (push) Blocked by required conditions
CI / kpm-qemu (android15-6.6) (push) Blocked by required conditions
CI / kpm-qemu (android16-6.12) (push) Blocked by required conditions
CI / kpm-qemu-legacy (4.14) (push) Blocked by required conditions
CI / kpm-qemu-legacy (4.19) (push) Blocked by required conditions
CI / kpm-qemu-legacy (5.4) (push) Blocked by required conditions
CI / kpm (push) Blocked by required conditions
CI / zygisk (push) Blocked by required conditions
CI / lsposed (push) Blocked by required conditions
CI / portshide (push) Blocked by required conditions
CI / release (push) Blocked by required conditions
release.py rewrites each crate's `version = "..."` in Cargo.toml but never touched Cargo.lock, so the lock kept the previous version. The first `cargo build` in CI then rewrote the lock to match, dirtying the working tree — and get_build_version()'s `git describe --dirty` stamped every artifact "X.Y.Z-dirty" (that's why the v1.1.0 KPM/Ports/etc. modules report 1.1.0-dirty). Two layers so it cannot recur: - release.py now runs `cargo update --offline --workspace` for both lockfiles after the Cargo.toml bump, so the release commit carries a matching lock. - The Rust build steps (activator, zygisk cdylib, lsposed probe) pass --locked, so a drifted lock fails the build loudly instead of silently rewriting it. Also commits the now-synced 1.1.0 lockfiles.
145 lines
4.6 KiB
Python
145 lines
4.6 KiB
Python
"""Shared helpers for build scripts.
|
|
|
|
Used by kmod/build.py, portshide/build-zip.py, zygisk/build.py,
|
|
and scripts/build-version.py.
|
|
|
|
Stdlib-only on purpose: scripts/build-version.py is invoked from
|
|
lsposed/app/build.gradle.kts on every Gradle build, so adding pip/uv
|
|
dependencies here would break the APK build for anyone without those
|
|
tools available.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import re
|
|
import shutil
|
|
import subprocess
|
|
import zipfile
|
|
from pathlib import Path
|
|
|
|
|
|
def make_zip(source_dir: Path, output_zip: Path) -> None:
|
|
"""Create a zip archive from source_dir contents."""
|
|
with zipfile.ZipFile(output_zip, "w", zipfile.ZIP_DEFLATED) as zf:
|
|
for file_path in source_dir.rglob("*"):
|
|
if file_path.is_file():
|
|
arcname = file_path.relative_to(source_dir)
|
|
zf.write(file_path, arcname)
|
|
|
|
|
|
def version_sort_key(name: str) -> tuple[int, ...]:
|
|
"""Sort key that orders strings by their embedded integer runs.
|
|
|
|
Used to pick the highest version when multiple toolchain directories
|
|
coexist (NDK 25.0.1 vs 100.0.0, clang-r450b vs clang-r498344b) where
|
|
plain lexicographic sort gives the wrong answer.
|
|
"""
|
|
return tuple(int(part) for part in re.findall(r"\d+", name))
|
|
|
|
|
|
def get_build_version(repo_root: Path | None = None) -> str:
|
|
"""Get the effective build version for vpnhide artifacts.
|
|
|
|
- VPNHIDE_BUILD_VERSION set -> that exact value
|
|
- HEAD on a tag vX.Y.Z -> "X.Y.Z" (release build)
|
|
- N commits after tag vX.Y.Z -> "X.Y.Z-N-gSHA" (dev build)
|
|
- working tree dirty -> additional "-dirty" suffix
|
|
- no git / no matching tag -> falls back to VERSION file
|
|
"""
|
|
override = os.environ.get("VPNHIDE_BUILD_VERSION")
|
|
if override and override.strip():
|
|
return override.strip().removeprefix("v")
|
|
|
|
if repo_root is None:
|
|
repo_root = Path(__file__).resolve().parent.parent
|
|
|
|
repo_root = repo_root.resolve()
|
|
result = subprocess.run(
|
|
[
|
|
"git",
|
|
"-c",
|
|
f"safe.directory={repo_root}",
|
|
"describe",
|
|
"--tags",
|
|
"--match",
|
|
"v*",
|
|
"--dirty",
|
|
],
|
|
cwd=repo_root,
|
|
capture_output=True,
|
|
text=True,
|
|
)
|
|
if result.returncode == 0 and result.stdout.strip():
|
|
return result.stdout.strip().removeprefix("v")
|
|
|
|
version_file = repo_root / "VERSION"
|
|
return version_file.read_text(encoding="utf-8").strip()
|
|
|
|
|
|
def detect_android_ndk() -> str | None:
|
|
"""Find an Android NDK for cargo-ndk based builds."""
|
|
android_ndk_home = os.environ.get("ANDROID_NDK_HOME")
|
|
if android_ndk_home and Path(android_ndk_home).is_dir():
|
|
return android_ndk_home
|
|
|
|
ndk_base = Path.home() / "Android" / "Sdk" / "ndk"
|
|
if not ndk_base.exists():
|
|
return None
|
|
versions = sorted((d.name for d in ndk_base.iterdir() if d.is_dir()), key=version_sort_key)
|
|
if not versions:
|
|
return None
|
|
return str(ndk_base / versions[-1])
|
|
|
|
|
|
def build_activator_bin(
|
|
repo_root: Path,
|
|
bin_name: str,
|
|
*,
|
|
android_ndk_home: str | None = None,
|
|
target_dir: Path | None = None,
|
|
required: bool = True,
|
|
) -> Path | None:
|
|
"""Build one Android arm64 activator binary and return its artifact path.
|
|
|
|
`required=False` lets the kmod DDK packaging path reuse a prebuilt binary
|
|
when Rust/NDK are unavailable in the kernel-build container.
|
|
"""
|
|
ndk = android_ndk_home or detect_android_ndk()
|
|
cargo = shutil.which("cargo")
|
|
if not ndk or not cargo:
|
|
msg = "cargo/Android NDK not available; activator not built"
|
|
if required:
|
|
raise RuntimeError(msg)
|
|
print(f"warning: {msg}")
|
|
return None
|
|
|
|
out_target_dir = target_dir or repo_root / "target"
|
|
env = os.environ.copy()
|
|
env["ANDROID_NDK_HOME"] = ndk
|
|
env["CARGO_TARGET_DIR"] = str(out_target_dir)
|
|
subprocess.run(
|
|
[
|
|
"cargo",
|
|
"ndk",
|
|
"-t",
|
|
"arm64-v8a",
|
|
"build",
|
|
"--release",
|
|
# Fail loudly if Cargo.lock is out of sync instead of silently
|
|
# rewriting it — a rewritten lock dirties the tree and stamps every
|
|
# artifact "X.Y.Z-dirty" via git describe --dirty.
|
|
"--locked",
|
|
"-p",
|
|
"vpnhide_activator",
|
|
"--bin",
|
|
bin_name,
|
|
],
|
|
cwd=repo_root,
|
|
env=env,
|
|
check=True,
|
|
)
|
|
artifact = out_target_dir / "aarch64-linux-android" / "release" / bin_name
|
|
if not artifact.exists():
|
|
raise RuntimeError(f"expected activator artifact {artifact}, not found")
|
|
return artifact
|