unity-devkit 0.1.25.dev37268005125__tar.gz → 0.3.0.dev223__tar.gz

{unity_devkit-0.1.25.dev37268005125 → unity_devkit-0.3.0.dev223}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.5
 Name: unity-devkit
-Version: 0.1.25.dev37268005125
+Version: 0.3.0.dev223
 Summary: Unity build, license, and CI tooling
 Requires-Python: >=3.13
 Requires-Dist: bashrun>=0.1.0
-Requires-Dist: ci-devkit>=0.1.15
+Requires-Dist: build-artifact-registry>=0.2.0.dev0
 Requires-Dist: pydantic-settings>=2.9.1
 Requires-Dist: pydantic>=2.11.7
 Requires-Dist: typer>=0.17.4

{unity_devkit-0.1.25.dev37268005125 → unity_devkit-0.3.0.dev223}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "unity-devkit"
-version = "0.1.25.dev37268005125"
+version = "0.3.0.dev223"
 description = "Unity build, license, and CI tooling"
 requires-python = ">=3.13"
 dependencies = [
     "bashrun>=0.1.0",
-    "ci-devkit>=0.1.15",
+    "build-artifact-registry>=0.2.0.dev0",
     "typer>=0.17.4",
     "pydantic>=2.11.7",
     "pydantic-settings>=2.9.1",
@@ -15,7 +15,6 @@ dependencies = [
 activate-unity-license = "unity_devkit.license:activate_app"
 build-unity = "unity_devkit.build_unity:app"
 build-unity-matrix = "unity_devkit.matrix:build_app"
-ci-build-unity = "unity_devkit.ci_build_unity:app"
 compile-check-unity = "unity_devkit.compile_check_unity:app"
 compile-check-unity-matrix = "unity_devkit.matrix:compile_check_app"
 install = "unity_devkit.install:app"

unity_devkit-0.3.0.dev223/src/unity_devkit/build_unity.py

@@ -0,0 +1,149 @@
+from __future__ import annotations
+
+import shutil
+from pathlib import Path
+from typing import Annotated
+
+import typer
+from bashrun.bash import bash, bash_output
+
+from build_artifact_registry.builds import build_repository, push_build
+from build_artifact_registry.cache import restore, save
+from build_artifact_registry.setup_oras import install_oras
+from .identity import builds_registry, cache_key, cache_registry
+from .license_restore import restore_or_activate_license
+from .player_build import build_player, parse_environment_fields, resolve_unity_project
+from .upm_cache import restore_upm_cache, save_upm_cache
+
+app = typer.Typer(add_completion=False, pretty_exceptions_show_locals=False)
+
+
+@app.command()
+def build_unity(
+    project: Annotated[str, typer.Option(help="Project name (the 'name' field of its unity-devkit.json)")],
+    platform: Annotated[str, typer.Option(help="Target platform (a key of the project's 'platforms' map)")],
+    version: Annotated[
+        str,
+        typer.Option(
+            help="Bare version base; with --commit-count renders bundleVersion={version}+{commit-count}; empty builds unversioned"
+        ),
+    ] = "",
+    pr_number: Annotated[
+        str, typer.Option(help="Pull-request number; empty on non-PR runs selects the dev cache scope")
+    ] = "",
+    commit_count: Annotated[
+        int,
+        typer.Option(help="Commit count rendering AndroidBundleVersionCode and the +{count} bundleVersion suffix"),
+    ] = 0,
+    license_cache_key: Annotated[
+        str,
+        typer.Option("--license-cache-key", help="ORAS tag the license cache restores under; empty uses today's tag"),
+    ] = "",
+    registry: Annotated[
+        str,
+        typer.Option(
+            help="Build-artifact registry root; supplied runs the CI shape (license/UPM/library caches, "
+            "build-output push), empty is the local build"
+        ),
+    ] = "",
+    development: Annotated[bool, typer.Option("--development", help="Development build column")] = False,
+    environment_preset: Annotated[
+        str, typer.Option(help="Environment preset name; empty leaves the workspace untouched")
+    ] = "",
+    environment_field: Annotated[
+        list[str] | None,
+        typer.Option("--environment-field", help="Environment field override as path=value (repeatable)"),
+    ] = None,
+) -> None:
+    fields = parse_environment_fields(environment_field or [])
+    parsed_pr_number = int(pr_number) if pr_number else None
+    derived_cache_key = cache_key(project, platform, parsed_pr_number)
+    library_cache_registry = cache_registry(registry)
+    builds_namespace = builds_registry(registry)
+    project_path = resolve_unity_project(project).path
+
+    if registry:
+        install_oras()
+        restore_or_activate_license(library_cache_registry, license_cache_key or None)
+        restore_upm_cache(project_path, library_cache_registry)
+        restore(library_cache_registry, "unity-library", derived_cache_key, Path("."))
+
+    artifacts = build_player(
+        project,
+        platform,
+        version=version,
+        commit_count=commit_count,
+        development=development,
+        environment_preset=environment_preset,
+        environment_fields=fields,
+    )
+    for artifact in artifacts:
+        print(f"Built: {artifact}")
+
+    if not registry:
+        return
+
+    # PackageCache (~1.6 GiB) is redundant with the shared UPM cache at ~/.cache/Unity/upm/
+    package_cache = project_path / "Library" / "PackageCache"
+    if package_cache.exists():
+        shutil.rmtree(package_cache)
+
+    relative_project_path = project_path.relative_to(Path.cwd())
+    save(library_cache_registry, "unity-library", derived_cache_key, Path("."), [f"{relative_project_path}/Library/"])
+    save_upm_cache(project_path, library_cache_registry)
+
+    build_directory = project_path / "Build"
+    if build_directory.is_dir():
+        artifact_directory = Path("/tmp/unity-builds")
+        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:
+            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 = report_directory / report.relative_to(build_directory)
+                destination.parent.mkdir(parents=True, exist_ok=True)
+                shutil.copy2(report, destination)
+
+    artifact_directory = Path("/tmp/unity-builds")
+    if not artifact_directory.is_dir() or not any(artifact_directory.iterdir()):
+        print("No build artifacts to push")
+        return
+
+    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)
+        tar_path = staging / "build.tar"
+        bash(f"tar -cf {tar_path} -C {artifact_directory} .")
+        try:
+            for build_tag in tags:
+                push_build(builds_namespace, project, platform, build_tag, staging, ["build.tar"])
+        finally:
+            tar_path.unlink(missing_ok=True)
+    else:
+        paths = sorted(
+            str(path.relative_to(artifact_directory)) for path in artifact_directory.rglob("*") if path.is_file()
+        )
+        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.dev37268005125 → unity_devkit-0.3.0.dev223}/src/unity_devkit/compile_check_unity.py

@@ -3,21 +3,13 @@ from __future__ import annotations
 from typing import Annotated
 
 import typer
-from pydantic_settings import BaseSettings
 
-from ci_devkit.ci_step import ci_step
-from ci_devkit.setup import configure_git
-from ci_devkit.setup_oras import install_oras
+from build_artifact_registry.setup_oras import install_oras
 from .identity import cache_registry
 from .license_restore import restore_or_activate_license
 from .player_build import prepare_unity_project, resolve_unity_project, run_unity_batchmode
 from .upm_cache import restore_upm_cache, save_upm_cache
 
-
-class Settings(BaseSettings):
-    github_workspace: str
-
-
 app = typer.Typer(add_completion=False, pretty_exceptions_show_locals=False)
 
 COMPILE_ERROR_SIGNATURES = ("error CS",)
@@ -26,13 +18,11 @@ COMPILE_ERROR_SIGNATURES = ("error CS",)
 @app.command()
 def compile_check_unity(
     project: Annotated[str, typer.Option(help="Unity project name (the 'name' field of its unity-devkit.json)")],
-    registry: Annotated[str, typer.Option(help="OCI registry root; the verb derives the cache namespace")],
-    license_pin: Annotated[
+    license_cache_key: Annotated[
         str,
-        typer.Option(
-            "--license", help="License cache pin for this run (the matrix verb's license output; empty uses today's)"
-        ),
+        typer.Option("--license-cache-key", help="ORAS tag the license cache restores under; empty uses today's tag"),
     ] = "",
+    registry: Annotated[str, typer.Option(help="OCI registry root; the verb derives the cache namespace")] = "",
     execute_method: Annotated[
         str | None,
         typer.Option(help="Static method to run after load (Class.Method) — one editor session per invocation"),
@@ -42,15 +32,14 @@ def compile_check_unity(
         typer.Option(help="Startup build target (e.g. Android) for sessions that must open on a non-default platform"),
     ] = None,
 ) -> None:
-    settings = Settings.model_validate({})
+    if not registry:
+        raise SystemExit("compile-check needs --registry (the OCI registry root)")
     project_path = resolve_unity_project(project).path
     cache_namespace = cache_registry(registry)
 
-    with ci_step("Setup"):
-        configure_git(settings.github_workspace)
-        install_oras()
-        restore_or_activate_license(cache_namespace, license_pin or None)
-        restore_upm_cache(project_path, cache_namespace)
+    install_oras()
+    restore_or_activate_license(cache_namespace, license_cache_key or None)
+    restore_upm_cache(project_path, cache_namespace)
 
     extra_flags = ""
     if build_target:

{unity_devkit-0.1.25.dev37268005125 → unity_devkit-0.3.0.dev223}/src/unity_devkit/install.py

@@ -8,8 +8,8 @@ from typing import Annotated
 import typer
 from bashrun.bash import bash, bash_handoff, bash_output
 
-from ci_devkit.builds import build_reference, build_repository, list_build_tags, pull_build
-from ci_devkit.setup_oras import install_oras
+from build_artifact_registry.builds import build_reference, build_repository, list_build_tags, pull_artifact
+from build_artifact_registry.setup_oras import install_oras
 
 from .identity import builds_registry, cache_key
 from .player_build import build_player
@@ -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)
@@ -133,7 +133,7 @@ def main(
             print(f"Using cached build: {cache_path}")
         else:
             cache_path.mkdir(parents=True, exist_ok=True)
-            pull_build(
+            pull_artifact(
                 registry,
                 project_name,
                 target_name,

{unity_devkit-0.1.25.dev37268005125 → unity_devkit-0.3.0.dev223}/src/unity_devkit/license.py

@@ -3,18 +3,10 @@ from __future__ import annotations
 from typing import Annotated
 
 import typer
-from pydantic_settings import BaseSettings
 
-from ci_devkit.setup import configure_git
-from ci_devkit.setup_oras import install_oras
+from build_artifact_registry.setup_oras import install_oras
 from .license_restore import activate_license, restore_or_activate_license
 
-
-class Settings(BaseSettings):
-    github_workspace: str
-
-
-settings = Settings.model_validate({})
 activate_app = typer.Typer(add_completion=False, pretty_exceptions_show_locals=False)
 
 
@@ -25,7 +17,6 @@ def activate_main(
     ] = False,
     registry: Annotated[str, typer.Option(help="OCI registry namespace for the license cache")] = "",
 ) -> None:
-    configure_git(settings.github_workspace)
     install_oras()
     if oras_push:
         if not registry:

{unity_devkit-0.1.25.dev37268005125 → unity_devkit-0.3.0.dev223}/src/unity_devkit/license_restore.py

@@ -9,7 +9,7 @@ import typer
 from bashrun.bash import CalledProcessError, bash
 from pydantic_settings import BaseSettings
 
-from ci_devkit.cache import restore, save
+from build_artifact_registry.cache import restore, save
 
 
 class Settings(BaseSettings):
@@ -72,7 +72,7 @@ def license_activated() -> bool:
     return True
 
 
-# A whole CI run pins one tag (the matrix verb's license output, passed as
-# --license) so a run straddling midnight UTC does not save/restore-miss itself.
+# A whole CI run pins one tag (the getter's unity-license-tag output, passed as
+# --license-cache-key) so a run straddling midnight UTC does not save/restore-miss itself.
 def license_cache_tag() -> str:
     return f"v-{datetime.now(UTC).strftime('%Y-%m-%d')}"

{unity_devkit-0.1.25.dev37268005125 → unity_devkit-0.3.0.dev223}/src/unity_devkit/matrix.py

@@ -5,7 +5,6 @@ from typing import Annotated
 
 import typer
 
-from .license_restore import license_cache_tag
 from .player_build import LICENSE_IMAGE_MODULE, PLATFORM_CONFIGS, UNITYCI_IMAGE_REVISION, read_editor_version
 from .projects import ProjectEntry, discover_projects
 
@@ -29,9 +28,8 @@ def build_matrix(
         for platform in entry.builds:
             image_module = PLATFORM_CONFIGS[platform]["unityci_image_module"]
             matrix.append({
-                "project-name": name,
+                "project": name,
                 "platform": platform,
-                "unityci-image-module": image_module,
                 "editor-image": f"unityci/editor:{version}-{image_module}-{UNITYCI_IMAGE_REVISION}",
             })
 
@@ -40,8 +38,7 @@ def build_matrix(
             "No projects with builds declared — build-unity-matrix needs at least one unity-devkit.json "
             "with a non-empty 'platforms' map"
         )
-    print(f"matrix={json.dumps({'include': matrix})}")
-    print(f"license={license_cache_tag()}")
+    print(json.dumps(matrix))
 
 
 @compile_check_app.command()
@@ -56,12 +53,11 @@ def compile_check_matrix(
     for name, entry in projects.items():
         version = read_editor_version(entry.path)
         matrix.append({
-            "project-name": name,
+            "project": name,
             "editor-image": f"unityci/editor:{version}-{LICENSE_IMAGE_MODULE}-{UNITYCI_IMAGE_REVISION}",
         })
 
-    print(f"matrix={json.dumps({'include': matrix})}")
-    print(f"license={license_cache_tag()}")
+    print(json.dumps(matrix))
 
 
 def filtered_projects(project: str | None) -> dict[str, ProjectEntry]:

{unity_devkit-0.1.25.dev37268005125 → unity_devkit-0.3.0.dev223}/src/unity_devkit/player_build.py

@@ -197,7 +197,7 @@ def build_player(
     build: str,
     *,
     version: str = "",
-    run_number: int = 0,
+    commit_count: int = 0,
     development: bool = False,
     environment_preset: str = "",
     environment_fields: dict[str, str] | None = None,
@@ -218,12 +218,13 @@ def build_player(
     prepare_unity_project(project_path)
 
     if version:
+        bundle_version = f"{version}+{commit_count}"
         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(commit_count)), ("bundleVersion", bundle_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 {bundle_version} (AndroidBundleVersionCode={commit_count}) into ProjectSettings")
 
     build_directory = project_path / "Build"
     before = snapshot_artifacts(build_directory)

{unity_devkit-0.1.25.dev37268005125 → unity_devkit-0.3.0.dev223}/src/unity_devkit/upm_cache.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import hashlib
 from pathlib import Path
 
-from ci_devkit.cache import restore, save
+from build_artifact_registry.cache import restore, save
 
 UPM_CACHE_NAME = "unity-upm"
 UPM_CACHE_DIRECTORY = Path.home() / ".cache" / "Unity" / "upm"

{unity_devkit-0.1.25.dev37268005125 → unity_devkit-0.3.0.dev223}/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", commit_count=42)
 
     rewritten = (project / "ProjectSettings" / "ProjectSettings.asset").read_text()
     assert "  AndroidBundleVersionCode: 42\n" in rewritten
@@ -56,15 +56,17 @@ def test_build_player_stamps_version_and_returns_artifacts(tmp_path: Path, monke
     assert RECEIVED_SESSIONS[0][0] == "-buildTarget Android -executeMethod Outernet.PlayerBuild.Entry"
 
 
-def test_build_player_treats_the_version_string_as_opaque(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+def test_build_player_appends_the_commit_count_to_an_opaque_version_base(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
     project = write_repository(tmp_path, PROJECT_SETTINGS, builds=["AndroidMobile"])
     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", commit_count=7)
 
     rewritten = (project / "ProjectSettings" / "ProjectSettings.asset").read_text()
-    assert "  bundleVersion: release-2026-09-27\n" in rewritten
+    assert "  bundleVersion: release-2026-09-27+7\n" in rewritten
 
 
 def test_build_player_refuses_to_stamp_a_missing_field(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
@@ -75,7 +77,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", commit_count=42)
 
 
 def test_build_player_fails_when_no_artifact_was_produced(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:

{unity_devkit-0.1.25.dev37268005125 → unity_devkit-0.3.0.dev223}/tests/test_matrix.py

@@ -24,17 +24,14 @@ def test_matrix_emits_entries_from_catalog(
 
     matrix.build_matrix()
 
-    lines = capsys.readouterr().out.splitlines()
-    include = json.loads(lines[0][len("matrix=") :])["include"]
-    assert include == [
+    legs = json.loads(capsys.readouterr().out)
+    assert legs == [
         {
-            "project-name": "tool",
+            "project": "tool",
             "platform": "Linux",
-            "unityci-image-module": "linux-il2cpp",
             "editor-image": "unityci/editor:6000.0.66f1-linux-il2cpp-3",
         }
     ]
-    assert lines[1].startswith("license=v-")
 
 
 def test_matrix_fails_without_builds(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
@@ -57,9 +54,8 @@ def test_matrix_project_filter_scopes_to_one_project(
 
     matrix.build_matrix(project="other")
 
-    lines = capsys.readouterr().out.splitlines()
-    include = json.loads(lines[0][len("matrix=") :])["include"]
-    assert [entry["project-name"] for entry in include] == ["other"]
+    legs = json.loads(capsys.readouterr().out)
+    assert [entry["project"] for entry in legs] == ["other"]
 
 
 def test_matrix_project_filter_fails_on_unknown_project(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
@@ -78,10 +74,8 @@ def test_check_matrix_includes_path_only_projects(
 
     matrix.compile_check_matrix()
 
-    lines = capsys.readouterr().out.splitlines()
-    include = json.loads(lines[0][len("matrix=") :])["include"]
-    assert include == [{"project-name": "tool", "editor-image": "unityci/editor:6000.0.66f1-linux-il2cpp-3"}]
-    assert lines[1].startswith("license=v-")
+    legs = json.loads(capsys.readouterr().out)
+    assert legs == [{"project": "tool", "editor-image": "unityci/editor:6000.0.66f1-linux-il2cpp-3"}]
 
 
 def test_check_matrix_project_filter_scopes_to_one_project(
@@ -96,6 +90,5 @@ def test_check_matrix_project_filter_scopes_to_one_project(
 
     matrix.compile_check_matrix(project="other")
 
-    lines = capsys.readouterr().out.splitlines()
-    include = json.loads(lines[0][len("matrix=") :])["include"]
-    assert include == [{"project-name": "other", "editor-image": "unityci/editor:6000.0.66f1-linux-il2cpp-3"}]
+    legs = json.loads(capsys.readouterr().out)
+    assert legs == [{"project": "other", "editor-image": "unityci/editor:6000.0.66f1-linux-il2cpp-3"}]

unity_devkit-0.1.25.dev37268005125/src/unity_devkit/build_unity.py

@@ -1,41 +0,0 @@
-from typing import Annotated
-
-import typer
-
-from .player_build import build_player, parse_environment_fields
-
-app = typer.Typer(add_completion=False, pretty_exceptions_show_locals=False)
-
-
-@app.command()
-def build_unity(
-    project: Annotated[str, typer.Option(help="Unity project name (the 'name' field of its unity-devkit.json)")],
-    build: Annotated[str, typer.Option(help="Build target from the project's builds list (e.g. AndroidMobile)")],
-    version: Annotated[
-        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,
-    development: Annotated[bool, typer.Option(help="Development build column")] = False,
-    environment_preset: Annotated[
-        str,
-        typer.Option(
-            help="Environment preset name (the env class's Presets key); unset leaves the workspace untouched"
-        ),
-    ] = "",
-    environment_field: Annotated[
-        list[str] | None,
-        typer.Option("--environment-field", help="Environment field override as path=value (repeatable)"),
-    ] = None,
-) -> None:
-    fields = parse_environment_fields(environment_field or [])
-    for artifact in build_player(
-        project,
-        build,
-        version=version,
-        run_number=run_number,
-        development=development,
-        environment_preset=environment_preset,
-        environment_fields=fields,
-    ):
-        print(f"Built: {artifact}")

unity_devkit-0.1.25.dev37268005125/src/unity_devkit/ci_build_unity.py

@@ -1,139 +0,0 @@
-from __future__ import annotations
-
-import shutil
-from pathlib import Path
-from typing import Annotated
-
-import typer
-from bashrun.bash import bash
-from pydantic_settings import BaseSettings
-
-from ci_devkit.builds import build_repository, push_build
-from ci_devkit.cache import restore, save
-from ci_devkit.ci_step import ci_step
-from ci_devkit.setup import configure_git, install_dotnet
-from ci_devkit.setup_oras import install_oras
-from .identity import builds_registry, cache_key, cache_registry
-from .license_restore import restore_or_activate_license
-from .player_build import build_player, parse_environment_fields, resolve_unity_project
-from .upm_cache import restore_upm_cache, save_upm_cache
-
-
-class Settings(BaseSettings):
-    github_workspace: str
-
-
-app = typer.Typer(add_completion=False, pretty_exceptions_show_locals=False)
-
-
-@app.command()
-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)")],
-    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")
-    ] = "",
-    license_pin: Annotated[
-        str,
-        typer.Option(
-            "--license", help="License cache pin for this run (the matrix verb's license output; empty uses today's)"
-        ),
-    ] = "",
-    environment_preset: Annotated[
-        str, typer.Option(help="Environment preset name; empty leaves the workspace untouched")
-    ] = "",
-    development: Annotated[bool, typer.Option("--development", help="Development build column")] = False,
-    environment_fields: Annotated[
-        str, typer.Option(help="Newline-separated path=value environment field overrides")
-    ] = "",
-    version: Annotated[
-        str, typer.Option(help="Version string to stamp into ProjectSettings.asset; empty builds unversioned")
-    ] = "",
-) -> None:
-    settings = Settings.model_validate({})
-    fields = parse_environment_fields(environment_fields.splitlines())
-    parsed_pr_number = int(pr_number) if pr_number else None
-    derived_cache_key = cache_key(project, platform, parsed_pr_number)
-    library_cache_registry = cache_registry(registry)
-    builds_namespace = builds_registry(registry)
-
-    with ci_step("Setup"):
-        configure_git(settings.github_workspace)
-        install_dotnet("8.0")
-        install_oras()
-        restore_or_activate_license(library_cache_registry, license_pin or None)
-        project_path = resolve_unity_project(project).path
-        restore_upm_cache(project_path, library_cache_registry)
-
-    with ci_step("Restore library cache"):
-        restore(library_cache_registry, "unity-library", derived_cache_key, Path("."))
-
-    with ci_step(f"Build {project} [{platform}]"):
-        build_player(
-            project,
-            platform,
-            version=version,
-            run_number=run_number,
-            development=development,
-            environment_preset=environment_preset,
-            environment_fields=fields,
-        )
-
-    with ci_step("Save library cache"):
-        # PackageCache (~1.6 GiB) is redundant with the shared UPM cache at ~/.cache/Unity/upm/
-        package_cache = project_path / "Library" / "PackageCache"
-        if package_cache.exists():
-            shutil.rmtree(package_cache)
-
-        relative_project_path = project_path.relative_to(Path.cwd())
-        save(
-            library_cache_registry, "unity-library", derived_cache_key, Path("."), [f"{relative_project_path}/Library/"]
-        )
-
-    with ci_step("Save UPM cache"):
-        save_upm_cache(project_path, library_cache_registry)
-
-    with ci_step("Collect build artifacts"):
-        build_directory = project_path / "Build"
-        if build_directory.is_dir():
-            artifact_directory = Path("/tmp/unity-builds")
-            artifact_directory.mkdir(parents=True, exist_ok=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)
-                for report in build_directory.rglob("BuildReport.json"):
-                    destination = artifact_directory / report.relative_to(build_directory)
-                    destination.parent.mkdir(parents=True, exist_ok=True)
-                    shutil.copy2(report, destination)
-
-    with ci_step("Push build artifacts"):
-        artifact_directory = Path("/tmp/unity-builds")
-        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}")
-            if platform == "Linux":
-                staging = Path("/tmp/unity-builds-push")
-                staging.mkdir(parents=True, exist_ok=True)
-                tar_path = staging / "build.tar"
-                bash(f"tar -cf {tar_path} -C {artifact_directory} .")
-                try:
-                    for build_tag in tags:
-                        push_build(builds_namespace, project, platform, build_tag, staging, ["build.tar"])
-                finally:
-                    tar_path.unlink(missing_ok=True)
-            else:
-                paths = sorted(
-                    str(path.relative_to(artifact_directory))
-                    for path in artifact_directory.rglob("*")
-                    if path.is_file()
-                )
-                for build_tag in tags:
-                    push_build(builds_namespace, project, platform, build_tag, artifact_directory, paths)
-            repository = build_repository(builds_namespace, project, platform)
-            print(f"Pushed build artifacts: {repository} ({', '.join(tags)})")