Merge branch 'master' into pubsync

.github/workflows/ci.yml

@@ -56,6 +56,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install pytest typing_extensions
+        python tools/pcommand win_ci_install_prereqs
     - name: Run tests
       run: python tools/pcommand pytest -v tests
     - name: Compile binary

tools/batools/pcommand.py

@@ -845,10 +845,9 @@ def gen_flat_data_code() -> None:
     batools.meta.gen_flat_data_code(str(PROJROOT), inpath, outpath, varname)
 
 
-def win_ci_binary_build() -> None:
+def win_ci_install_prereqs() -> None:
-    """Simple windows binary build for ci."""
+    """Install bits needed for basic win ci."""
     import json
-    import subprocess
     from efrotools.efrocache import get_target
 
     # We'll need to pull a handful of things out of efrocache for the
@@ -864,18 +863,24 @@ def win_ci_binary_build() -> None:
     }
 
     # Look through everything that gets generated by our meta builds
-    # and pick out anything the compile requires.
+    # and pick out anything we need for our basic builds/tests.
     with open('src/meta/.meta_manifest_public.json') as infile:
         meta_public: List[str] = json.loads(infile.read())
     with open('src/meta/.meta_manifest_private.json') as infile:
         meta_private: List[str] = json.loads(infile.read())
     for target in meta_public + meta_private:
-        if target.startswith('src/ballistica/generated/'):
+        if (target.startswith('src/ballistica/generated/') or
+                target.startswith('assets/src/ba_data/python/ba/_generated/')):
             needed_targets.add(target)
 
     for target in needed_targets:
         get_target(target)
 
+
+def win_ci_binary_build() -> None:
+    """Simple windows binary build for ci."""
+    import subprocess
+
     # Do the thing.
     subprocess.run(
         [

tools/pcommand

@@ -42,7 +42,7 @@ from batools.pcommand import (
     wsl_build_check_win_drive, win_ci_binary_build, genchangelog,
     android_sdk_utils, update_resources_makefile, update_meta_makefile,
     xcode_build_path, gen_python_enums_module, gen_python_init_module,
-    update_dummy_module)
+    update_dummy_module, win_ci_install_prereqs)
 # pylint: enable=unused-import
 
 if TYPE_CHECKING: