diff options
| -rw-r--r-- | .github/workflows/ci.yml | 1 | ||||
| -rw-r--r-- | tools/win_build.py | 21 |
2 files changed, 6 insertions, 16 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d970e264..b461e3d3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,6 @@ jobs: matrix: buildConfiguration: [Debug, Release] architecture: [x86, x64] - fail-fast: true steps: - uses: actions/checkout@v2 diff --git a/tools/win_build.py b/tools/win_build.py index c011aafe..73086917 100644 --- a/tools/win_build.py +++ b/tools/win_build.py @@ -8,8 +8,6 @@ import sys parser = argparse.ArgumentParser() parser.add_argument('command', choices=[ 'configure', 'build', 'test'], nargs='?', default='test', help='specify command to execute') -parser.add_argument('--skip-install-packages', action="store_true", - help='skip using vcpkg to install package') parser.add_argument('-a', '--arch', choices=['x86', 'x64'], default='x64', help='specify target cpu architecture') parser.add_argument('-c', '--config', choices=['Debug', 'Release'], @@ -38,11 +36,6 @@ work_dir = os.path.join(project_root, args.work_dir) # continue # os.environ[k] = v -def install_packages(): - subprocess.check_call( - 'vcpkg install', stdout=sys.stdout, stderr=sys.stderr) - - def configure(): generater_vs_arch_map = { 'x86': 'Win32', @@ -69,12 +62,10 @@ def test(): os.chdir(project_root) -if not args.skip_install_packages: - install_packages() - configure() - -if args.command == 'build' or args.command == 'test': - build() - if args.command == 'test': - test() +if args.command == 'configure': + return +build() +if args.command == 'build': + return +test() |