mirror of
https://github.com/RYDE-WORK/ballistica.git
synced 2026-02-07 16:13:23 +08:00
fixing windows ci
This commit is contained in:
parent
4c1bc979f8
commit
d046f8087f
1
.github/workflows/ci.yml
vendored
1
.github/workflows/ci.yml
vendored
@ -56,6 +56,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
python -m pip install --upgrade pip
|
python -m pip install --upgrade pip
|
||||||
pip install pytest typing_extensions
|
pip install pytest typing_extensions
|
||||||
|
python tools/pcommand win_ci_install_prereqs
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
run: python tools/pcommand pytest -v tests
|
run: python tools/pcommand pytest -v tests
|
||||||
- name: Compile binary
|
- name: Compile binary
|
||||||
|
|||||||
@ -845,10 +845,9 @@ def gen_flat_data_code() -> None:
|
|||||||
batools.meta.gen_flat_data_code(str(PROJROOT), inpath, outpath, varname)
|
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 json
|
||||||
import subprocess
|
|
||||||
from efrotools.efrocache import get_target
|
from efrotools.efrocache import get_target
|
||||||
|
|
||||||
# We'll need to pull a handfull of things out of efrocache for the
|
# We'll need to pull a handfull 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
|
# 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:
|
with open('src/meta/.meta_manifest_public.json') as infile:
|
||||||
meta_public: List[str] = json.loads(infile.read())
|
meta_public: List[str] = json.loads(infile.read())
|
||||||
with open('src/meta/.meta_manifest_private.json') as infile:
|
with open('src/meta/.meta_manifest_private.json') as infile:
|
||||||
meta_private: List[str] = json.loads(infile.read())
|
meta_private: List[str] = json.loads(infile.read())
|
||||||
for target in meta_public + meta_private:
|
for target in meta_public + meta_private:
|
||||||
if target.startswith('src/ballistica/generated/'):
|
if (target.startswith('src/ballistica/generated/')
|
||||||
|
or target.startswith('src/ba_data/python/ba/_generated/')):
|
||||||
needed_targets.add(target)
|
needed_targets.add(target)
|
||||||
|
|
||||||
for target in needed_targets:
|
for target in needed_targets:
|
||||||
get_target(target)
|
get_target(target)
|
||||||
|
|
||||||
|
|
||||||
|
def win_ci_binary_build() -> None:
|
||||||
|
"""Simple windows binary build for ci."""
|
||||||
|
import subprocess
|
||||||
|
|
||||||
# Do the thing.
|
# Do the thing.
|
||||||
subprocess.run(
|
subprocess.run(
|
||||||
[
|
[
|
||||||
|
|||||||
@ -41,7 +41,8 @@ from batools.pcommand import (
|
|||||||
cmake_prep_dir, gen_binding_code, gen_flat_data_code, wsl_path_to_win,
|
cmake_prep_dir, gen_binding_code, gen_flat_data_code, wsl_path_to_win,
|
||||||
wsl_build_check_win_drive, win_ci_binary_build, genchangelog,
|
wsl_build_check_win_drive, win_ci_binary_build, genchangelog,
|
||||||
android_sdk_utils, update_resources_makefile, update_meta_makefile,
|
android_sdk_utils, update_resources_makefile, update_meta_makefile,
|
||||||
xcode_build_path, update_python_enums_module, update_dummy_module)
|
xcode_build_path, update_python_enums_module, update_dummy_module,
|
||||||
|
win_ci_install_prereqs)
|
||||||
# pylint: enable=unused-import
|
# pylint: enable=unused-import
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user