diff options
| author |  Mike Klein <mtklein@chromium.org> | 2017-01-23 11:58:53 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-23 19:54:49 +0000 |
| commit | b48fd3cc891bf3db0c354dcb6988e244ffd0dd65 (patch) | |
| tree | 3d56f427c7c46f661253198c82962f69a34e9084 /infra | |
| parent | db8b8376b09cec9656b0ab864413b7911d81a84c (diff) | |
GN: add 32-bit and Release iOS builders.
And roll recipes to the point where they pass target_cpu to GN,
adding x86_64 as an alias for x64.
CQ_INCLUDE_TRYBOTS=skia.primary:Build-Mac-Clang-arm64-Debug-GN_iOS,Build-Mac-Clang-arm64-Release-GN_iOS,Build-Mac-Clang-arm-Debug-GN_iOS,Build-Mac-Clang-arm-Release-GN_iOS
Change-Id: I1933d5803ec7f59f78576c5a7b16489362905a97
Reviewed-on: https://skia-review.googlesource.com/7403
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'infra')
| -rw-r--r-- | infra/bots/gen_tasks.go | 3 | ||||
| -rw-r--r-- | infra/bots/tasks.json | 93 | ||||
| -rw-r--r-- | infra/config/recipes.cfg | 2 |
3 files changed, 97 insertions, 1 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index 89a6fe2860..5fc6a32fa6 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -40,8 +40,11 @@ var ( JOBS = []string{ "Build-Mac-Clang-Arm7-Debug-iOS", "Build-Mac-Clang-Arm7-Release-iOS", + "Build-Mac-Clang-arm-Debug-GN_iOS", + "Build-Mac-Clang-arm-Release-GN_iOS", "Build-Mac-Clang-arm64-Debug-Android", "Build-Mac-Clang-arm64-Debug-GN_iOS", + "Build-Mac-Clang-arm64-Release-GN_iOS", "Build-Mac-Clang-x86_64-Debug", "Build-Mac-Clang-x86_64-Debug-CommandBuffer", "Build-Mac-Clang-x86_64-Release", diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index e81a5d6cf8..39e6dc9449 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -12,6 +12,18 @@ "Build-Mac-Clang-Arm7-Release-iOS" ] }, + "Build-Mac-Clang-arm-Debug-GN_iOS": { + "priority": 0.8, + "tasks": [ + "Build-Mac-Clang-arm-Debug-GN_iOS" + ] + }, + "Build-Mac-Clang-arm-Release-GN_iOS": { + "priority": 0.8, + "tasks": [ + "Build-Mac-Clang-arm-Release-GN_iOS" + ] + }, "Build-Mac-Clang-arm64-Debug-Android": { "priority": 0.8, "tasks": [ @@ -24,6 +36,12 @@ "Build-Mac-Clang-arm64-Debug-GN_iOS" ] }, + "Build-Mac-Clang-arm64-Release-GN_iOS": { + "priority": 0.8, + "tasks": [ + "Build-Mac-Clang-arm64-Release-GN_iOS" + ] + }, "Build-Mac-Clang-x86_64-Debug": { "priority": 0.8, "tasks": [ @@ -1657,6 +1675,56 @@ "isolate": "compile_skia.isolate", "priority": 0.8 }, + "Build-Mac-Clang-arm-Debug-GN_iOS": { + "dimensions": [ + "gpu:none", + "os:Mac-10.11", + "pool:Skia" + ], + "extra_args": [ + "--workdir", + "../../..", + "swarm_compile", + "repository=<(REPO)", + "buildername=Build-Mac-Clang-arm-Debug-GN_iOS", + "mastername=fake-master", + "buildnumber=2", + "slavename=fake-buildslave", + "nobuildbot=True", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "isolate": "compile_skia.isolate", + "priority": 0.8 + }, + "Build-Mac-Clang-arm-Release-GN_iOS": { + "dimensions": [ + "gpu:none", + "os:Mac-10.11", + "pool:Skia" + ], + "extra_args": [ + "--workdir", + "../../..", + "swarm_compile", + "repository=<(REPO)", + "buildername=Build-Mac-Clang-arm-Release-GN_iOS", + "mastername=fake-master", + "buildnumber=2", + "slavename=fake-buildslave", + "nobuildbot=True", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "isolate": "compile_skia.isolate", + "priority": 0.8 + }, "Build-Mac-Clang-arm64-Debug-Android": { "cipd_packages": [ { @@ -1714,6 +1782,31 @@ "isolate": "compile_skia.isolate", "priority": 0.8 }, + "Build-Mac-Clang-arm64-Release-GN_iOS": { + "dimensions": [ + "gpu:none", + "os:Mac-10.11", + "pool:Skia" + ], + "extra_args": [ + "--workdir", + "../../..", + "swarm_compile", + "repository=<(REPO)", + "buildername=Build-Mac-Clang-arm64-Release-GN_iOS", + "mastername=fake-master", + "buildnumber=2", + "slavename=fake-buildslave", + "nobuildbot=True", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "isolate": "compile_skia.isolate", + "priority": 0.8 + }, "Build-Mac-Clang-x86_64-Debug": { "dimensions": [ "gpu:none", diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index 20c852992a..b9289deecf 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -23,5 +23,5 @@ deps { project_id: "skia-recipes" url: "https://skia.googlesource.com/skia-recipes.git" branch: "master" - revision: "e2e91bd2def317153737460ec00b4266ff03e4ab" + revision: "471b831bb80d33fa1d5f98ec3801ad704ec93481" } |