diff options
| author |  Ben Wagner <benjaminwagner@google.com> | 2018-04-26 16:58:00 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-26 21:14:43 +0000 |
| commit | 0820a6fb697be598b41b65c7645659e216b30bc5 (patch) | |
| tree | b3fbcdfaf81337a4a2ac7db7dd9057002078de9e | |
| parent | 36122e74c1d34983b60ca9dcf8cb4bed6bde7d40 (diff) | |
Fix missing/duplicate named caches
Fixes issue with https://skia-review.googlesource.com/c/skia/+/123929
No-Try: true
Change-Id: I582b2bba67b8b257f35c5b85ccfe6e6304ff7a7c
Reviewed-on: https://skia-review.googlesource.com/124180
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Auto-Submit: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
| -rw-r--r-- | infra/bots/gen_tasks.go | 2 | ||||
| -rw-r--r-- | infra/bots/tasks.json | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index 636c99d64a..d7699b3059 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -823,6 +823,7 @@ func ctSKPs(b *specs.TasksCfgBuilder, name string) string { // by hand. func checkGeneratedFiles(b *specs.TasksCfgBuilder, name string) string { task := kitchenTask(name, "check_generated_files", "swarm_recipe.isolate", SERVICE_ACCOUNT_COMPILE, linuxGceDimensions(), nil, OUTPUT_NONE) + task.Caches = append(task.Caches, CACHES_WORKDIR...) b.MustAddTask(name, task) return name } @@ -832,7 +833,6 @@ func checkGeneratedFiles(b *specs.TasksCfgBuilder, name string) string { func housekeeper(b *specs.TasksCfgBuilder, name, compileTaskName string) string { task := kitchenTask(name, "housekeeper", "swarm_recipe.isolate", SERVICE_ACCOUNT_HOUSEKEEPER, linuxGceDimensions(), nil, OUTPUT_NONE) usesGit(task, name) - task.Caches = append(task.Caches, CACHES_WORKDIR...) task.CipdPackages = append(task.CipdPackages, b.MustGetCipdPackageFromAsset("go")) task.Dependencies = append(task.Dependencies, compileTaskName) b.MustAddTask(name, task) diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index 2e51051124..34c5e97c1a 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -17090,10 +17090,6 @@ { "name": "work", "path": "cache/work" - }, - { - "name": "work", - "path": "cache/work" } ], "cipd_packages": [ @@ -17366,6 +17362,10 @@ { "name": "vpython", "path": "cache/vpython" + }, + { + "name": "work", + "path": "cache/work" } ], "cipd_packages": [ |