unity-devkit 0.1.25__tar.gz → 0.2.0.dev215__tar.gz

{unity_devkit-0.1.25 → unity_devkit-0.2.0.dev215}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: unity-devkit
-Version: 0.1.25
+Version: 0.2.0.dev215
 Summary: Unity build, license, and CI tooling
 Requires-Python: >=3.13
 Requires-Dist: bashrun>=0.1.0

{unity_devkit-0.1.25 → unity_devkit-0.2.0.dev215}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "unity-devkit"
-version = "0.1.25"
+version = "0.2.0.dev215"
 description = "Unity build, license, and CI tooling"
 requires-python = ">=3.13"
 dependencies = [

{unity_devkit-0.1.25 → unity_devkit-0.2.0.dev215}/src/unity_devkit/build_unity.py

@@ -15,7 +15,9 @@ def build_unity(
         str,
         typer.Option(help="Version string to stamp into ProjectSettings.asset; empty builds unversioned"),
     ] = "",
-    run_number: Annotated[int, typer.Option(help="bundleVersionCode to stamp; local builds default to 0")] = 0,
+    version_code: Annotated[
+        int, typer.Option(help="Android bundleVersionCode to stamp; local builds default to 0")
+    ] = 0,
     development: Annotated[bool, typer.Option(help="Development build column")] = False,
     environment_preset: Annotated[
         str,
@@ -33,7 +35,7 @@ def build_unity(
         project,
         build,
         version=version,
-        run_number=run_number,
+        version_code=version_code,
         development=development,
         environment_preset=environment_preset,
         environment_fields=fields,

{unity_devkit-0.1.25 → unity_devkit-0.2.0.dev215}/src/unity_devkit/ci_build_unity.py

@@ -5,7 +5,7 @@ from pathlib import Path
 from typing import Annotated
 
 import typer
-from bashrun.bash import bash
+from bashrun.bash import bash, bash_output
 from pydantic_settings import BaseSettings
 
 from ci_devkit.builds import build_repository, push_build
@@ -30,7 +30,9 @@ app = typer.Typer(add_completion=False, pretty_exceptions_show_locals=False)
 def ci_build_unity(
     project: Annotated[str, typer.Option(help="Project name")],
     platform: Annotated[str, typer.Option(help="Target platform")],
-    run_number: Annotated[int, typer.Option(help="CI run number (also the bundleVersionCode)")],
+    version_code: Annotated[
+        int, typer.Option(help="Android bundleVersionCode (the per-app commit count from get-app-version)")
+    ],
     registry: Annotated[str, typer.Option(help="OCI registry root; the verb derives the cache and builds namespaces")],
     pr_number: Annotated[
         str, typer.Option(help="Pull-request number; empty on non-PR runs selects the dev cache scope")
@@ -75,7 +77,7 @@ def ci_build_unity(
             project,
             platform,
             version=version,
-            run_number=run_number,
+            version_code=version_code,
             development=development,
             environment_preset=environment_preset,
             environment_fields=fields,
@@ -99,15 +101,22 @@ def ci_build_unity(
         build_directory = project_path / "Build"
         if build_directory.is_dir():
             artifact_directory = Path("/tmp/unity-builds")
-            artifact_directory.mkdir(parents=True, exist_ok=True)
+            shutil.rmtree(artifact_directory, ignore_errors=True)
+            artifact_directory.mkdir(parents=True)
+            report_directory = Path("/tmp/unity-build-reports")
+            shutil.rmtree(report_directory, ignore_errors=True)
             if platform == "Linux":
                 shutil.copytree(build_directory, artifact_directory, dirs_exist_ok=True)
             else:
-                for file in build_directory.rglob("*"):
-                    if file.suffix in {".apk", ".exe"}:
-                        shutil.copy2(file, artifact_directory / file.name)
+                binaries = [file for file in build_directory.rglob("*") if file.suffix in {".apk", ".exe"}]
+                if len(binaries) != 1:
+                    raise SystemExit(
+                        f"build for ({project}, {platform}) must produce exactly one binary, "
+                        f"found {len(binaries)} ({', '.join(file.name for file in binaries)})"
+                    )
+                shutil.copy2(binaries[0], artifact_directory / binaries[0].name)
                 for report in build_directory.rglob("BuildReport.json"):
-                    destination = artifact_directory / report.relative_to(build_directory)
+                    destination = report_directory / report.relative_to(build_directory)
                     destination.parent.mkdir(parents=True, exist_ok=True)
                     shutil.copy2(report, destination)
 
@@ -116,7 +125,8 @@ def ci_build_unity(
         if not artifact_directory.is_dir() or not any(artifact_directory.iterdir()):
             print("No build artifacts to push")
         else:
-            tags = (derived_cache_key, f"run-{run_number}")
+            head_sha = bash_output("git rev-parse HEAD").strip()
+            tags = (derived_cache_key, f"sha-{head_sha}")
             if platform == "Linux":
                 staging = Path("/tmp/unity-builds-push")
                 staging.mkdir(parents=True, exist_ok=True)
@@ -135,5 +145,15 @@ def ci_build_unity(
                 )
                 for build_tag in tags:
                     push_build(builds_namespace, project, platform, build_tag, artifact_directory, paths)
+
+                report_directory = Path("/tmp/unity-build-reports")
+                if report_directory.is_dir():
+                    report_paths = sorted(
+                        str(path.relative_to(report_directory)) for path in report_directory.rglob("BuildReport.json")
+                    )
+                    for build_tag in tags:
+                        push_build(
+                            builds_namespace, project, f"{platform}-report", build_tag, report_directory, report_paths
+                        )
             repository = build_repository(builds_namespace, project, platform)
             print(f"Pushed build artifacts: {repository} ({', '.join(tags)})")

{unity_devkit-0.1.25 → unity_devkit-0.2.0.dev215}/src/unity_devkit/install.py

@@ -33,9 +33,9 @@ def main(
         str,
         typer.Option("--pr-number", help="Pull-request number; empty (outside PRs) selects the dev cache-key tag"),
     ] = "",
-    run: Annotated[
-        int | None,
-        typer.Option("--run", "-r", help="Specific CI run number (github.run_number) to pull"),
+    sha: Annotated[
+        str | None,
+        typer.Option("--sha", help="CI head SHA whose sha-{sha} builds-shelf tag to pull"),
     ] = None,
     serial: Annotated[str | None, typer.Option("--serial", "-s", help="adb device serial")] = None,
     build_locally: Annotated[
@@ -45,7 +45,7 @@ def main(
             "-B",
             help=(
                 "Build the project locally via `build-unity` and install the produced APK / "
-                "linux executable. Skips the OCI pull; --pr-number / --run are ignored."
+                "linux executable. Skips the OCI pull; --pr-number / --sha are ignored."
             ),
         ),
     ] = False,
@@ -95,8 +95,8 @@ def main(
         return
 
     if build_locally:
-        if pr_number or run:
-            print("Warning: --pr-number / --run are ignored when --build is set")
+        if pr_number or sha:
+            print("Warning: --pr-number / --sha are ignored when --build is set")
         if dry_run:
             print(f"Would build {project_name} [{target_name}] locally")
             if target_name in ADB_TARGETS:
@@ -110,7 +110,7 @@ def main(
         executables = [path for path in produced if path.suffix in {".exe", ".x86_64"}]
     else:
         parsed_pr_number = int(pr_number) if pr_number else None
-        tag = f"run-{run}" if run else cache_key(project_name, target_name, parsed_pr_number)
+        tag = f"sha-{sha}" if sha else cache_key(project_name, target_name, parsed_pr_number)
 
         registry = _builds_registry()
         reference = build_reference(registry, project_name, target_name, tag)

{unity_devkit-0.1.25 → unity_devkit-0.2.0.dev215}/src/unity_devkit/player_build.py

@@ -197,7 +197,7 @@ def build_player(
     build: str,
     *,
     version: str = "",
-    run_number: int = 0,
+    version_code: int = 0,
     development: bool = False,
     environment_preset: str = "",
     environment_fields: dict[str, str] | None = None,
@@ -220,10 +220,10 @@ def build_player(
     if version:
         settings_path = project_path / "ProjectSettings" / "ProjectSettings.asset"
         rewritten = settings_path.read_text(encoding="utf-8")
-        for field_name, value in (("AndroidBundleVersionCode", str(run_number)), ("bundleVersion", version)):
+        for field_name, value in (("AndroidBundleVersionCode", str(version_code)), ("bundleVersion", version)):
             rewritten = replace_serialized_field(rewritten, field_name, value)
         settings_path.write_text(rewritten, encoding="utf-8")
-        print(f"Stamped bundleVersion {version} (bundleVersionCode={run_number}) into ProjectSettings")
+        print(f"Stamped bundleVersion {version} (bundleVersionCode={version_code}) into ProjectSettings")
 
     build_directory = project_path / "Build"
     before = snapshot_artifacts(build_directory)

{unity_devkit-0.1.25 → unity_devkit-0.2.0.dev215}/tests/test_build_player.py

@@ -46,7 +46,7 @@ def test_build_player_stamps_version_and_returns_artifacts(tmp_path: Path, monke
     monkeypatch.chdir(tmp_path)
     monkeypatch.setattr(player_build, "run_unity_batchmode", fake_unity_build_producing)
 
-    produced = player_build.build_player("tool", "AndroidMobile", version="0.2.7-dev+42", run_number=42)
+    produced = player_build.build_player("tool", "AndroidMobile", version="0.2.7-dev+42", version_code=42)
 
     rewritten = (project / "ProjectSettings" / "ProjectSettings.asset").read_text()
     assert "  AndroidBundleVersionCode: 42\n" in rewritten
@@ -61,7 +61,7 @@ def test_build_player_treats_the_version_string_as_opaque(tmp_path: Path, monkey
     monkeypatch.chdir(tmp_path)
     monkeypatch.setattr(player_build, "run_unity_batchmode", fake_unity_build_producing)
 
-    player_build.build_player("tool", "AndroidMobile", version="release-2026-09-27", run_number=7)
+    player_build.build_player("tool", "AndroidMobile", version="release-2026-09-27", version_code=7)
 
     rewritten = (project / "ProjectSettings" / "ProjectSettings.asset").read_text()
     assert "  bundleVersion: release-2026-09-27\n" in rewritten
@@ -75,7 +75,7 @@ def test_build_player_refuses_to_stamp_a_missing_field(tmp_path: Path, monkeypat
     monkeypatch.setattr(player_build, "run_unity_batchmode", fake_unity_build_producing)
 
     with pytest.raises(SystemExit, match="AndroidBundleVersionCode"):
-        player_build.build_player("tool", "AndroidMobile", version="0.2.7-dev+42", run_number=42)
+        player_build.build_player("tool", "AndroidMobile", version="0.2.7-dev+42", version_code=42)
 
 
 def test_build_player_fails_when_no_artifact_was_produced(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None: