AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix missing/duplicate named caches

Browse Source 
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>
This commit is contained in:
Ben Wagner 2018-04-26 16:58:00 -04:00 committed by Skia Commit-Bot
parent 36122e74c1
commit 0820a6fb69
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infra/bots/gen_tasks.go
View File

@ -823,6 +823,7 @@ func ctSKPs(b *specs.TasksCfgBuilder, name string) string {
// by hand. // by hand.
func checkGeneratedFiles(b *specs.TasksCfgBuilder, name string) string { 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 := 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) b.MustAddTask(name, task)
return name return name
} }
@ -832,7 +833,6 @@ func checkGeneratedFiles(b *specs.TasksCfgBuilder, name string) string {
func housekeeper(b *specs.TasksCfgBuilder, name, compileTaskName 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) task := kitchenTask(name, "housekeeper", "swarm_recipe.isolate", SERVICE_ACCOUNT_HOUSEKEEPER, linuxGceDimensions(), nil, OUTPUT_NONE)
usesGit(task, name) usesGit(task, name)
task.Caches = append(task.Caches, CACHES_WORKDIR...)
task.CipdPackages = append(task.CipdPackages, b.MustGetCipdPackageFromAsset("go")) task.CipdPackages = append(task.CipdPackages, b.MustGetCipdPackageFromAsset("go"))
task.Dependencies = append(task.Dependencies, compileTaskName) task.Dependencies = append(task.Dependencies, compileTaskName)
b.MustAddTask(name, task) b.MustAddTask(name, task)

8
infra/bots/tasks.json
View File

@ -17087,10 +17087,6 @@
"name": "git_cache", "name": "git_cache",
"path": "cache/git_cache" "path": "cache/git_cache"
}, },
{
"name": "work",
"path": "cache/work"
},
{ {
"name": "work", "name": "work",
"path": "cache/work" "path": "cache/work"
@ -17366,6 +17362,10 @@
{ {
"name": "vpython", "name": "vpython",
"path": "cache/vpython" "path": "cache/vpython"
},
{
"name": "work",
"path": "cache/work"
} }
], ],
"cipd_packages": [ "cipd_packages": [