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>
This commit is contained in:
parent
36122e74c1
commit
0820a6fb69
@ -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)
|
||||
|
@ -17087,10 +17087,6 @@
|
||||
"name": "git_cache",
|
||||
"path": "cache/git_cache"
|
||||
},
|
||||
{
|
||||
"name": "work",
|
||||
"path": "cache/work"
|
||||
},
|
||||
{
|
||||
"name": "work",
|
||||
"path": "cache/work"
|
||||
@ -17366,6 +17362,10 @@
|
||||
{
|
||||
"name": "vpython",
|
||||
"path": "cache/vpython"
|
||||
},
|
||||
{
|
||||
"name": "work",
|
||||
"path": "cache/work"
|
||||
}
|
||||
],
|
||||
"cipd_packages": [
|
||||
|
Loading…
Reference in New Issue
Block a user