diff options
| author |  Mike Klein <mtklein@chromium.org> | 2016-10-15 11:09:30 -0400 |
|---|---|---|
| committer | Mike Klein <mtklein@chromium.org> | 2016-10-15 15:18:15 +0000 |
| commit | 97e4a86606671cd94ce2f5f63507685cef602768 (patch) | |
| tree | d9cf2c0314e1e860c43eecb8be824fef720999dd /infra/bots/recipes/swarm_compile.expected/big_issue_number.json | |
| parent | 5ec5590bf796ef9d966f7348b3ce81a6e3fe3848 (diff) | |
Put all Win bots on GN except -ANGLE bots.
Not quite there yet for ANGLE. The rest should be good to go.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3424
Change-Id: I9d6ad1de75bb0d9c1e18a9220a7ca82c84f74235
Reviewed-on: https://skia-review.googlesource.com/3424
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'infra/bots/recipes/swarm_compile.expected/big_issue_number.json')
| -rw-r--r-- | infra/bots/recipes/swarm_compile.expected/big_issue_number.json | 41 |
1 files changed, 25 insertions, 16 deletions
diff --git a/infra/bots/recipes/swarm_compile.expected/big_issue_number.json b/infra/bots/recipes/swarm_compile.expected/big_issue_number.json index 0da480065a..d5d1dcfc36 100644 --- a/infra/bots/recipes/swarm_compile.expected/big_issue_number.json +++ b/infra/bots/recipes/swarm_compile.expected/big_issue_number.json @@ -143,30 +143,39 @@ "cmd": [ "python", "-u", - "[CUSTOM_C:\\_B_WORK]\\skia\\infra\\bots\\bootstrap_win_toolchain_json.py", - "--win_toolchain_json", - "[SLAVE_BUILD]\\src\\build\\win_toolchain.json", - "--depot_tools_parent_dir", - "[SLAVE_BUILD]" + "[CUSTOM_C:\\_B_WORK]\\skia\\bin\\fetch-gn" ], - "name": "bootstrap win toolchain" + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "env": { + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "fetch-gn" }, { "cmd": [ - "python", - "make.py", - "most" + "gn.bat", + "gen", + "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug\\Debug", + "--args=target_cpu=\"x86\" windk=\"[SLAVE_BUILD]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\"" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "CHROME_PATH": "[SLAVE_BUILD]\\src", - "GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0", - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "gn gen" + }, + { + "cmd": [ + "ninja.exe", + "-C", + "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug\\Debug" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" }, - "name": "build most" + "name": "ninja" }, { "cmd": [ |