Add Goma for all Windows Clang Builds.
Change-Id: I26e75cf6cd865ec6c47b7766679177bfd30387da
Reviewed-on: https://skia-review.googlesource.com/82921
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index 581ec3a..7830745 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -67,11 +67,16 @@
"Build-Win-Clang-arm64-Release-Android",
"Build-Win-Clang-x86_64-Debug",
"Build-Win-Clang-x86_64-Debug-ANGLE",
+ "Build-Win-Clang-x86_64-Debug-ANGLE_Goma",
"Build-Win-Clang-x86_64-Debug-Goma",
"Build-Win-Clang-x86_64-Debug-Vulkan",
+ "Build-Win-Clang-x86_64-Debug-Vulkan_Goma",
"Build-Win-Clang-x86_64-Release",
"Build-Win-Clang-x86_64-Release-ANGLE",
+ "Build-Win-Clang-x86_64-Release-ANGLE_Goma",
+ "Build-Win-Clang-x86_64-Release-Goma",
"Build-Win-Clang-x86_64-Release-Vulkan",
+ "Build-Win-Clang-x86_64-Release-Vulkan_Goma",
"Build-Win-MSVC-x86-Debug",
"Build-Win-MSVC-x86-Debug-Exceptions",
"Build-Win-MSVC-x86-Release",
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-ANGLE_Goma.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-ANGLE_Goma.json
new file mode 100644
index 0000000..fdf5d5b
--- /dev/null
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-ANGLE_Goma.json
@@ -0,0 +1,196 @@
+[
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "[START_DIR]/tmp"
+ ],
+ "infra_step": true,
+ "name": "makedirs tmp_dir"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "\nimport os\nimport sys\nimport urllib2\n\nTOKEN_URL = (\n 'http://metadata/computeMetadata/v1/project/attributes/jwt_service_account_goma-client')\n\nreq = urllib2.Request(TOKEN_URL, headers={'Metadata-Flavor': 'Google'})\ncontents = urllib2.urlopen(req).read()\n\nwith open(sys.argv[1], 'w') as f:\n f.write(contents)\n",
+ "[START_DIR]/tmp/jwt_service_account_goma-client.json"
+ ],
+ "infra_step": true,
+ "name": "download jwt_service_account_goma-client.json",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import os@@@",
+ "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+ "@@@STEP_LOG_LINE@python.inline@import urllib2@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@TOKEN_URL = (@@@",
+ "@@@STEP_LOG_LINE@python.inline@ 'http://metadata/computeMetadata/v1/project/attributes/jwt_service_account_goma-client')@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@req = urllib2.Request(TOKEN_URL, headers={'Metadata-Flavor': 'Google'})@@@",
+ "@@@STEP_LOG_LINE@python.inline@contents = urllib2.urlopen(req).read()@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@with open(sys.argv[1], 'w') as f:@@@",
+ "@@@STEP_LOG_LINE@python.inline@ f.write(contents)@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "cipd",
+ "ensure",
+ "-root",
+ "[CACHE]/goma",
+ "-ensure-file",
+ "infra_internal/goma/client/linux-amd64 release",
+ "-json-output",
+ "/path/to/tmp/json",
+ "-service-account-json",
+ "[START_DIR]/tmp/jwt_service_account_goma-client.json"
+ ],
+ "name": "ensure_installed",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/linux-amd64\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "goma_ctl.py",
+ "ensure_start"
+ ],
+ "cwd": "[CACHE]/goma",
+ "env": {
+ "BUILDTYPE": "Release_x64",
+ "CHROME_HEADLESS": "1",
+ "GOMA_FALLBACK": "0",
+ "GOMA_HERMETIC": "error",
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "[START_DIR]/tmp/jwt_service_account_goma-client.json",
+ "GOMA_USE_LOCAL": "0",
+ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
+ "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-ANGLE_Goma"
+ },
+ "infra_step": true,
+ "name": "start goma"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[CUSTOM_C:\\_B_WORK]/skia/bin/fetch-gn"
+ ],
+ "cwd": "[CUSTOM_C:\\_B_WORK]/skia",
+ "env": {
+ "BUILDTYPE": "Release_x64",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
+ "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-ANGLE_Goma"
+ },
+ "infra_step": true,
+ "name": "fetch-gn"
+ },
+ {
+ "cmd": [
+ "[CUSTOM_C:\\_B_WORK]/skia/bin/gn.exe",
+ "gen",
+ "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-ANGLE_Goma/Release_x64",
+ "--args=cc=\"clang\" cc_wrapper=\"[CACHE]/goma/gomacc\" clang_win=\"[START_DIR]/clang_win\" cxx=\"clang++\" extra_cflags=[\"-Wno-nonportable-include-path\"] is_debug=false skia_use_angle=true target_cpu=\"x86_64\" win_sdk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/VC\""
+ ],
+ "cwd": "[CUSTOM_C:\\_B_WORK]/skia",
+ "env": {
+ "BUILDTYPE": "Release_x64",
+ "CHROME_HEADLESS": "1",
+ "GOMA_FALLBACK": "0",
+ "GOMA_HERMETIC": "error",
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "[START_DIR]/tmp/jwt_service_account_goma-client.json",
+ "GOMA_USE_LOCAL": "0",
+ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
+ "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-ANGLE_Goma"
+ },
+ "name": "gn gen"
+ },
+ {
+ "cmd": [
+ "ninja.exe",
+ "-k",
+ "0",
+ "-C",
+ "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-ANGLE_Goma/Release_x64",
+ "-j",
+ "100"
+ ],
+ "cwd": "[CUSTOM_C:\\_B_WORK]/skia",
+ "env": {
+ "BUILDTYPE": "Release_x64",
+ "CHROME_HEADLESS": "1",
+ "GOMA_FALLBACK": "0",
+ "GOMA_HERMETIC": "error",
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "[START_DIR]/tmp/jwt_service_account_goma-client.json",
+ "GOMA_USE_LOCAL": "0",
+ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
+ "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-ANGLE_Goma"
+ },
+ "name": "ninja"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "goma_ctl.py",
+ "stat"
+ ],
+ "cwd": "[CACHE]/goma",
+ "env": {
+ "BUILDTYPE": "Release_x64",
+ "CHROME_HEADLESS": "1",
+ "GOMA_FALLBACK": "0",
+ "GOMA_HERMETIC": "error",
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "[START_DIR]/tmp/jwt_service_account_goma-client.json",
+ "GOMA_USE_LOCAL": "0",
+ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
+ "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-ANGLE_Goma"
+ },
+ "infra_step": true,
+ "name": "print goma stats"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "goma_ctl.py",
+ "stop"
+ ],
+ "cwd": "[CACHE]/goma",
+ "env": {
+ "BUILDTYPE": "Release_x64",
+ "CHROME_HEADLESS": "1",
+ "GOMA_FALLBACK": "0",
+ "GOMA_HERMETIC": "error",
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "[START_DIR]/tmp/jwt_service_account_goma-client.json",
+ "GOMA_USE_LOCAL": "0",
+ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
+ "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-ANGLE_Goma"
+ },
+ "infra_step": true,
+ "name": "stop goma"
+ },
+ {
+ "name": "$result",
+ "recipe_result": null,
+ "status_code": 0
+ }
+]
\ No newline at end of file
diff --git a/infra/bots/recipe_modules/flavor/examples/full.py b/infra/bots/recipe_modules/flavor/examples/full.py
index 5535623..ab41b92 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.py
+++ b/infra/bots/recipe_modules/flavor/examples/full.py
@@ -78,6 +78,7 @@
'Build-Win-Clang-arm64-Release-Android',
'Build-Win-Clang-x86_64-Debug-GDI',
'Build-Win-Clang-x86_64-Release',
+ 'Build-Win-Clang-x86_64-Release-ANGLE_Goma',
'Build-Win-Clang-x86_64-Release-Goma',
'Build-Win-Clang-x86_64-Release-Vulkan',
'Build-Win-MSVC-x86-Debug-Exceptions',
diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py
index d75f9f4..b538c78 100644
--- a/infra/bots/recipe_modules/flavor/gn_flavor.py
+++ b/infra/bots/recipe_modules/flavor/gn_flavor.py
@@ -183,6 +183,10 @@
with self.m.context(cwd=goma_dir, env=env):
self._py('start goma', 'goma_ctl.py', args=['ensure_start'])
args['cc_wrapper'] = '"%s"' % goma_dir.join('gomacc')
+ if 'ANGLE' in extra_tokens and 'Win' in os:
+ # ANGLE uses case-insensitive include paths in D3D code. Not sure why
+ # only Goma warns about this.
+ extra_cflags.append('-Wno-nonportable-include-path')
ninja_args.extend(['-j', '100'])
sanitize = ''
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index b1cf611..01b97d7 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -413,6 +413,12 @@
"Build-Win-Clang-x86_64-Debug-ANGLE"
]
},
+ "Build-Win-Clang-x86_64-Debug-ANGLE_Goma": {
+ "priority": 0.8,
+ "tasks": [
+ "Build-Win-Clang-x86_64-Debug-ANGLE_Goma"
+ ]
+ },
"Build-Win-Clang-x86_64-Debug-Goma": {
"priority": 0.8,
"tasks": [
@@ -425,6 +431,12 @@
"Build-Win-Clang-x86_64-Debug-Vulkan"
]
},
+ "Build-Win-Clang-x86_64-Debug-Vulkan_Goma": {
+ "priority": 0.8,
+ "tasks": [
+ "Build-Win-Clang-x86_64-Debug-Vulkan_Goma"
+ ]
+ },
"Build-Win-Clang-x86_64-Release": {
"priority": 0.8,
"tasks": [
@@ -437,12 +449,30 @@
"Build-Win-Clang-x86_64-Release-ANGLE"
]
},
+ "Build-Win-Clang-x86_64-Release-ANGLE_Goma": {
+ "priority": 0.8,
+ "tasks": [
+ "Build-Win-Clang-x86_64-Release-ANGLE_Goma"
+ ]
+ },
+ "Build-Win-Clang-x86_64-Release-Goma": {
+ "priority": 0.8,
+ "tasks": [
+ "Build-Win-Clang-x86_64-Release-Goma"
+ ]
+ },
"Build-Win-Clang-x86_64-Release-Vulkan": {
"priority": 0.8,
"tasks": [
"Build-Win-Clang-x86_64-Release-Vulkan"
]
},
+ "Build-Win-Clang-x86_64-Release-Vulkan_Goma": {
+ "priority": 0.8,
+ "tasks": [
+ "Build-Win-Clang-x86_64-Release-Vulkan_Goma"
+ ]
+ },
"Build-Win-MSVC-x86-Debug": {
"priority": 0.8,
"tasks": [
@@ -4820,6 +4850,39 @@
"isolate": "compile_skia.isolate",
"priority": 0.8
},
+ "Build-Win-Clang-x86_64-Debug-ANGLE_Goma": {
+ "cipd_packages": [
+ {
+ "name": "skia/bots/clang_win",
+ "path": "clang_win",
+ "version": "version:2"
+ }
+ ],
+ "dependencies": [
+ "Housekeeper-PerCommit-IsolateWinToolchain"
+ ],
+ "dimensions": [
+ "cpu:x86-64-Haswell_GCE",
+ "gpu:none",
+ "os:Windows-2016Server-14393",
+ "pool:Skia"
+ ],
+ "extra_args": [
+ "--workdir",
+ "../../..",
+ "compile",
+ "repository=<(REPO)",
+ "buildername=Build-Win-Clang-x86_64-Debug-ANGLE_Goma",
+ "swarm_out_dir=${ISOLATED_OUTDIR}",
+ "revision=<(REVISION)",
+ "patch_repo=<(PATCH_REPO)",
+ "patch_storage=<(PATCH_STORAGE)",
+ "patch_issue=<(ISSUE)",
+ "patch_set=<(PATCHSET)"
+ ],
+ "isolate": "compile_skia.isolate",
+ "priority": 0.8
+ },
"Build-Win-Clang-x86_64-Debug-Goma": {
"cipd_packages": [
{
@@ -4887,6 +4950,40 @@
"isolate": "compile_skia.isolate",
"priority": 0.8
},
+ "Build-Win-Clang-x86_64-Debug-Vulkan_Goma": {
+ "cipd_packages": [
+ {
+ "name": "skia/bots/clang_win",
+ "path": "clang_win",
+ "version": "version:2"
+ }
+ ],
+ "dependencies": [
+ "Housekeeper-PerCommit-IsolateWinToolchain",
+ "Housekeeper-PerCommit-IsolateWinVulkanSDK"
+ ],
+ "dimensions": [
+ "cpu:x86-64-Haswell_GCE",
+ "gpu:none",
+ "os:Windows-2016Server-14393",
+ "pool:Skia"
+ ],
+ "extra_args": [
+ "--workdir",
+ "../../..",
+ "compile",
+ "repository=<(REPO)",
+ "buildername=Build-Win-Clang-x86_64-Debug-Vulkan_Goma",
+ "swarm_out_dir=${ISOLATED_OUTDIR}",
+ "revision=<(REVISION)",
+ "patch_repo=<(PATCH_REPO)",
+ "patch_storage=<(PATCH_STORAGE)",
+ "patch_issue=<(ISSUE)",
+ "patch_set=<(PATCHSET)"
+ ],
+ "isolate": "compile_skia.isolate",
+ "priority": 0.8
+ },
"Build-Win-Clang-x86_64-Release": {
"cipd_packages": [
{
@@ -4953,6 +5050,72 @@
"isolate": "compile_skia.isolate",
"priority": 0.8
},
+ "Build-Win-Clang-x86_64-Release-ANGLE_Goma": {
+ "cipd_packages": [
+ {
+ "name": "skia/bots/clang_win",
+ "path": "clang_win",
+ "version": "version:2"
+ }
+ ],
+ "dependencies": [
+ "Housekeeper-PerCommit-IsolateWinToolchain"
+ ],
+ "dimensions": [
+ "cpu:x86-64-Haswell_GCE",
+ "gpu:none",
+ "os:Windows-2016Server-14393",
+ "pool:Skia"
+ ],
+ "extra_args": [
+ "--workdir",
+ "../../..",
+ "compile",
+ "repository=<(REPO)",
+ "buildername=Build-Win-Clang-x86_64-Release-ANGLE_Goma",
+ "swarm_out_dir=${ISOLATED_OUTDIR}",
+ "revision=<(REVISION)",
+ "patch_repo=<(PATCH_REPO)",
+ "patch_storage=<(PATCH_STORAGE)",
+ "patch_issue=<(ISSUE)",
+ "patch_set=<(PATCHSET)"
+ ],
+ "isolate": "compile_skia.isolate",
+ "priority": 0.8
+ },
+ "Build-Win-Clang-x86_64-Release-Goma": {
+ "cipd_packages": [
+ {
+ "name": "skia/bots/clang_win",
+ "path": "clang_win",
+ "version": "version:2"
+ }
+ ],
+ "dependencies": [
+ "Housekeeper-PerCommit-IsolateWinToolchain"
+ ],
+ "dimensions": [
+ "cpu:x86-64-Haswell_GCE",
+ "gpu:none",
+ "os:Windows-2016Server-14393",
+ "pool:Skia"
+ ],
+ "extra_args": [
+ "--workdir",
+ "../../..",
+ "compile",
+ "repository=<(REPO)",
+ "buildername=Build-Win-Clang-x86_64-Release-Goma",
+ "swarm_out_dir=${ISOLATED_OUTDIR}",
+ "revision=<(REVISION)",
+ "patch_repo=<(PATCH_REPO)",
+ "patch_storage=<(PATCH_STORAGE)",
+ "patch_issue=<(ISSUE)",
+ "patch_set=<(PATCHSET)"
+ ],
+ "isolate": "compile_skia.isolate",
+ "priority": 0.8
+ },
"Build-Win-Clang-x86_64-Release-Vulkan": {
"cipd_packages": [
{
@@ -4987,6 +5150,40 @@
"isolate": "compile_skia.isolate",
"priority": 0.8
},
+ "Build-Win-Clang-x86_64-Release-Vulkan_Goma": {
+ "cipd_packages": [
+ {
+ "name": "skia/bots/clang_win",
+ "path": "clang_win",
+ "version": "version:2"
+ }
+ ],
+ "dependencies": [
+ "Housekeeper-PerCommit-IsolateWinToolchain",
+ "Housekeeper-PerCommit-IsolateWinVulkanSDK"
+ ],
+ "dimensions": [
+ "cpu:x86-64-Haswell_GCE",
+ "gpu:none",
+ "os:Windows-2016Server-14393",
+ "pool:Skia"
+ ],
+ "extra_args": [
+ "--workdir",
+ "../../..",
+ "compile",
+ "repository=<(REPO)",
+ "buildername=Build-Win-Clang-x86_64-Release-Vulkan_Goma",
+ "swarm_out_dir=${ISOLATED_OUTDIR}",
+ "revision=<(REVISION)",
+ "patch_repo=<(PATCH_REPO)",
+ "patch_storage=<(PATCH_STORAGE)",
+ "patch_issue=<(ISSUE)",
+ "patch_set=<(PATCHSET)"
+ ],
+ "isolate": "compile_skia.isolate",
+ "priority": 0.8
+ },
"Build-Win-MSVC-x86-Debug": {
"dependencies": [
"Housekeeper-PerCommit-IsolateWinToolchain"