unity-devkit 0.1.18__tar.gz → 0.1.20__tar.gz

{unity_devkit-0.1.18 → unity_devkit-0.1.20}/PKG-INFO

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

{unity_devkit-0.1.18 → unity_devkit-0.1.20}/pyproject.toml

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

{unity_devkit-0.1.18 → unity_devkit-0.1.20}/src/unity_devkit/ci_build_unity.py

@@ -5,6 +5,7 @@ from pathlib import Path
 from typing import Annotated
 
 import typer
+from bashrun.bash import bash
 from pydantic_settings import BaseSettings
 
 from ci_devkit.cache import restore, save
@@ -28,7 +29,8 @@ def ci_build_unity(
     project_path: Annotated[Path, typer.Option(help="Path to Unity project")],
     platform: Annotated[str, typer.Option(help="Target platform")],
     cache_key: Annotated[str, typer.Option(help="Cache key prefix")],
-    registry: Annotated[str, typer.Option(help="OCI registry path")],
+    registry: Annotated[str, typer.Option(help="OCI registry path for the library cache")],
+    builds_registry: Annotated[str, typer.Option(help="OCI registry path for build artifacts")],
     run_number: Annotated[int, typer.Option(help="CI run number")] = 0,
     branch: Annotated[str, typer.Option(help="Git branch name")] = "dev",
     environment_preset: Annotated[
@@ -96,3 +98,26 @@ def ci_build_unity(
                 for file in build_directory.rglob("*"):
                     if file.suffix in {".apk", ".exe"}:
                         shutil.copy2(file, artifact_directory / file.name)
+
+    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:
+            reference_base = f"{builds_registry}/{project}-{platform}".lower()
+            tags = (branch_slug, 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:
+                        bash(f"oras push {reference_base}:{build_tag} build.tar", cwd=staging)
+                finally:
+                    tar_path.unlink(missing_ok=True)
+            else:
+                joined = " ".join(sorted(p.name for p in artifact_directory.iterdir() if p.is_file()))
+                for build_tag in tags:
+                    bash(f"oras push {reference_base}:{build_tag} {joined}", cwd=artifact_directory)
+            print(f"Pushed build artifacts: {reference_base} ({', '.join(tags)})")

{unity_devkit-0.1.18 → unity_devkit-0.1.20}/src/unity_devkit/dispatch_workflow_generator.py

@@ -63,8 +63,8 @@ def unity_dispatch(
     build_workflow: Annotated[
         str,
         typer.Option(
-            help="The build job's uses: value — the consumer's pinned build-unity.yml reference "
-            "(owner/repo/.github/workflows/build-unity.yml@sha, or ./.github/workflows/build-unity.yml inside unity-devkit)"
+            help="The build job's uses: value — the consumer's pinned build-unity-internal.yml reference "
+            "(owner/repo/.github/workflows/build-unity-internal.yml@sha, or ./.github/workflows/build-unity-internal.yml inside unity-devkit)"
         ),
     ],
     environment_config_class: Annotated[
@@ -160,6 +160,11 @@ def render_dispatch_workflow(dump: EnvironmentDump, *, project: str, output: str
         f"{dump.class_name} —"
     )
 
+    workflow_call_input_blocks: list[tuple[str, str | None, list[str], str | None]] = [
+        ("runner-labels", "JSON-encoded runs-on value", ["type: string"], "default: '\"ubuntu-latest\"'"),
+        ("version", "Version string to stamp; empty builds unversioned", ["type: string"], "default: ''"),
+    ]
+
     lines = [
         header,
         "# edit the class, then regenerate this workflow.",
@@ -169,13 +174,18 @@ def render_dispatch_workflow(dump: EnvironmentDump, *, project: str, output: str
         "  workflow_dispatch:",
         "    inputs:",
         *indent_lines([line for block in input_blocks for line in build_input_block(block)], 6),
+        "  workflow_call:",
+        "    inputs:",
+        *indent_lines([line for block in workflow_call_input_blocks for line in build_input_block(block)], 6),
         "",
         "jobs:",
         "  build:",
         f"    uses: {build_workflow}",
         "    with:",
-        "      environment-preset: ${{ inputs['environment-preset'] }}",
-        "      development: ${{ inputs.development }}",
+        "      runner-labels: ${{ inputs.runner-labels || '\"ubuntu-latest\"' }}",
+        "      version: ${{ inputs.version || '' }}",
+        "      environment-preset: ${{ inputs['environment-preset'] || '' }}",
+        "      development: ${{ inputs.development || false }}",
     ]
     if transport_lines:
         lines.append("      environment-fields: |-")

{unity_devkit-0.1.18 → unity_devkit-0.1.20}/src/unity_devkit/install.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
-import json
 import os
+import shutil
 from pathlib import Path
-from typing import Annotated, Any
+from typing import Annotated
 
 import typer
-from bashrun.bash import bash, bash_handoff, bash_output
+from bashrun.bash import bash, bash_check, bash_handoff, bash_output
 
 from .projects import discover_projects
 from .player_build import build_player
@@ -27,9 +27,12 @@ def main(
     ] = None,
     branch: Annotated[
         str | None,
-        typer.Option("--branch", "-b", help="Branch to find latest successful run (default: current git branch)"),
+        typer.Option("--branch", "-b", help="Branch to pull the build from (default: current git branch)"),
+    ] = None,
+    run: Annotated[
+        int | None,
+        typer.Option("--run", "-r", help="Specific CI run number (github.run_number) to pull"),
     ] = None,
-    run: Annotated[int | None, typer.Option("--run", "-r", help="Specific GitHub Actions run ID")] = None,
     serial: Annotated[str | None, typer.Option("--serial", "-s", help="adb device serial")] = None,
     build_locally: Annotated[
         bool,
@@ -38,10 +41,18 @@ def main(
             "-B",
             help=(
                 "Build the project locally via `build-unity` and install the produced APK / "
-                "linux executable. Skips the GitHub Actions artifact lookup; --branch / --run are ignored."
+                "linux executable. Skips the OCI pull; --branch / --run are ignored."
             ),
         ),
     ] = False,
+    list_tags: Annotated[
+        bool,
+        typer.Option("--list", help="List available build tags for (project, target) and exit"),
+    ] = False,
+    dry_run: Annotated[
+        bool,
+        typer.Option("--dry-run", help="Print what would be fetched/installed without doing it"),
+    ] = False,
 ) -> None:
     projects = discover_projects()
 
@@ -68,51 +79,73 @@ def main(
     if serial and target_name not in ADB_TARGETS:
         print(f"Warning: --serial is ignored for target '{target_name}'")
 
+    package_name = f"{project_name}-{target_name}".lower()
+
+    if list_tags:
+        _require_oras()
+        reference_base = _resolve_reference_base(package_name)
+        _login_ghcr()
+        if bash_check(f"oras repo tags {reference_base}"):
+            output = bash_output(f"oras repo tags {reference_base}")
+            if output.strip():
+                print(f"Available tags for {reference_base}:")
+                print(output, end="")
+            else:
+                print(f"No tags found for {reference_base}")
+        else:
+            print(f"No tags found for {reference_base}")
+        return
+
     if build_locally:
         if branch or run:
             print("Warning: --branch / --run are ignored when --build is set")
+        if dry_run:
+            print(f"Would build {project_name} [{target_name}] locally")
+            if target_name in ADB_TARGETS:
+                serial_part = f" -s {serial}" if serial else ""
+                print(f"Would install: adb{serial_part} install <apk>")
+            elif target_name == "Linux":
+                print("Would launch the produced executable")
+            return
         produced = build_player(project_name, target_name)
         apks = [path for path in produced if path.suffix == ".apk"]
         executables = [path for path in produced if path.suffix in {".exe", ".x86_64"}]
     else:
-        artifact_name = f"{project_name}-{target_name}"
-
         resolved_branch = branch
         if not resolved_branch:
             resolved_branch = bash_output("git rev-parse --abbrev-ref HEAD").strip()
             if resolved_branch == "HEAD":
                 raise typer.BadParameter("HEAD is detached; pass --branch explicitly")
 
-        if run:
-            run_id = str(run)
-        else:
-            owner_repo = bash_output("gh repo view --json nameWithOwner --jq .nameWithOwner").strip()
-            output = bash_output(
-                f"gh api repos/{owner_repo}/actions/artifacts --method GET -f name={artifact_name}"
-                f" -f per_page=10 --jq .artifacts"
-            )
-            artifacts: list[dict[str, Any]] = json.loads(output)
-            run_id = next(
-                (
-                    str(artifact["workflow_run"]["id"])
-                    for artifact in artifacts
-                    if artifact["workflow_run"]["head_branch"] == resolved_branch
-                ),
-                None,
-            )
-            if run_id is None:
-                print(f"No artifact '{artifact_name}' found on branch '{resolved_branch}'")
-                raise SystemExit(1)
+        tag = f"run-{run}" if run else resolved_branch.replace("/", "-")
 
-        print(f"Run: {run_id}")
-        print(f"Artifact: {artifact_name}")
+        reference_base = _resolve_reference_base(package_name)
+        reference = f"{reference_base}:{tag}"
+        cache_path = CACHE_ROOT / tag / package_name
+
+        if dry_run:
+            print(f"Would pull: {reference}")
+            print(f"Cache: {cache_path}")
+            if target_name in ADB_TARGETS:
+                serial_part = f" -s {serial}" if serial else ""
+                print(f"Would install: adb{serial_part} install <apk>")
+            elif target_name == "Linux":
+                print("Would extract build.tar and launch the executable")
+            return
+
+        _require_oras()
+        _login_ghcr()
 
-        cache_path = CACHE_ROOT / run_id / artifact_name
         if cache_path.is_dir() and any(cache_path.iterdir()):
-            print(f"Using cached artifact: {cache_path}")
+            print(f"Using cached build: {cache_path}")
         else:
             cache_path.mkdir(parents=True, exist_ok=True)
-            bash(f"gh run download {run_id} --name {artifact_name} --dir {cache_path}")
+            bash(f"oras pull {reference} -o {cache_path}")
+            if target_name == "Linux":
+                tar_path = cache_path / "build.tar"
+                if tar_path.exists():
+                    bash(f"tar -xf {tar_path} -C {cache_path}")
+                    tar_path.unlink()
 
         apks = sorted(cache_path.rglob("*.apk"))
 
@@ -148,3 +181,22 @@ def main(
         os.chmod(executable, executable.stat().st_mode | 0o755)
         print(f"Launching: {executable.name}")
         bash_handoff(str(executable))
+
+
+def _require_oras() -> None:
+    if not shutil.which("oras"):
+        print("Error: oras is not on PATH. Install it:")
+        print("  macOS:  brew install oras")
+        print("  Linux:  https://oras.land/docs/install")
+        print("  Windows: scoop install oras")
+        raise SystemExit(1)
+
+
+def _resolve_reference_base(package_name: str) -> str:
+    owner_repo = bash_output("gh repo view --json nameWithOwner --jq .nameWithOwner").strip()
+    return f"ghcr.io/{owner_repo}/builds/{package_name}".lower()
+
+
+def _login_ghcr() -> None:
+    token = bash_output("gh auth token").strip()
+    bash("oras login ghcr.io --username oauth2 --password-stdin", stdin_text=token)

{unity_devkit-0.1.18 → unity_devkit-0.1.20}/tests/test_dispatch_workflow_generator.py

@@ -13,9 +13,7 @@ from unity_devkit.dispatch_workflow_generator import (
 from unity_devkit.player_build import parse_environment_fields
 
 FIXTURE_DUMP = Path(__file__).parent / "fixtures" / "environment-dump.json"
-PINNED_BUILD_WORKFLOW = (
-    "outernet-foundation/unity-devkit/.github/workflows/build-unity.yml@cfd487e0e19b3d98046a2680a210137ec0d32832"
-)
+PINNED_BUILD_WORKFLOW = "outernet-foundation/unity-devkit/.github/workflows/build-unity-internal.yml@cfd487e0e19b3d98046a2680a210137ec0d32832"
 
 
 def load_fixture_dump() -> EnvironmentDump:
@@ -53,7 +51,7 @@ def test_render_states_the_override_law_once_on_the_preset_input() -> None:
     assert "environment field" not in workflow
     assert "empty keeps the preset value" not in workflow
     assert "checked overrides the preset value" not in workflow
-    assert workflow.count("description:") == 3
+    assert workflow.count("description:") == 5
 
 
 def test_render_maps_field_types_to_dispatch_inputs_without_descriptions() -> None:
@@ -159,11 +157,28 @@ def test_rendered_workflow_is_valid_yaml() -> None:
         "apiUrl",
         "portNumber",
     ]
+    call_inputs = trigger["workflow_call"]["inputs"]
+    assert list(call_inputs) == ["runner-labels", "version"]
+    assert call_inputs["runner-labels"]["type"] == "string"
+    assert call_inputs["runner-labels"]["default"] == '"ubuntu-latest"'
+    assert call_inputs["version"]["type"] == "string"
+    assert call_inputs["version"]["default"] == ""
     assert document["jobs"]["build"]["uses"] == PINNED_BUILD_WORKFLOW
     assert document["jobs"]["build"]["secrets"] == "inherit"
     with_block = document["jobs"]["build"]["with"]
-    assert with_block["environment-preset"] == "__EXPR_OPEN__ inputs['environment-preset'] __EXPR_CLOSE__"
-    assert with_block["development"] == "__EXPR_OPEN__ inputs.development __EXPR_CLOSE__"
+    assert with_block["runner-labels"] == "__EXPR_OPEN__ inputs.runner-labels || '\"ubuntu-latest\"' __EXPR_CLOSE__"
+    assert with_block["version"] == "__EXPR_OPEN__ inputs.version || '' __EXPR_CLOSE__"
+    assert with_block["environment-preset"] == "__EXPR_OPEN__ inputs['environment-preset'] || '' __EXPR_CLOSE__"
+    assert with_block["development"] == "__EXPR_OPEN__ inputs.development || false __EXPR_CLOSE__"
+
+
+def test_render_with_block_uses_or_defaults_for_dual_trigger_support() -> None:
+    workflow = render_fixture_workflow()
+
+    assert "runner-labels: ${{ inputs.runner-labels || '\"ubuntu-latest\"' }}" in workflow
+    assert "version: ${{ inputs.version || '' }}" in workflow
+    assert "environment-preset: ${{ inputs['environment-preset'] || '' }}" in workflow
+    assert "development: ${{ inputs.development || false }}" in workflow
 
 
 def test_render_header_embeds_the_full_regen_command() -> None: