| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 package main | 5 package main |
| 6 | 6 |
| 7 import ( | 7 import ( |
| 8 "encoding/json" | 8 "encoding/json" |
| 9 "flag" | 9 "flag" |
| 10 "fmt" | 10 "fmt" |
| (...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 | 226 |
| 227 props := mapDiff(b.Properties, commonProps) | 227 props := mapDiff(b.Properties, commonProps) |
| 228 properties, propertiesJ := encodeProperties(props) | 228 properties, propertiesJ := encodeProperties(props) |
| 229 recipeName := b.Recipe | 229 recipeName := b.Recipe |
| 230 if recipeName == out.CommonRecipe.GetName() { | 230 if recipeName == out.CommonRecipe.GetName() { |
| 231 recipeName = "" | 231 recipeName = "" |
| 232 } | 232 } |
| 233 out.Builders = append(out.Builders, &buildbucket.Swarming_Builde
r{ | 233 out.Builders = append(out.Builders, &buildbucket.Swarming_Builde
r{ |
| 234 Category: &b.Category, | 234 Category: &b.Category, |
| 235 Dimensions: mapToList(dims), | 235 Dimensions: mapToList(dims), |
| 236 » » » ExecutionTimeoutSecs: proto.Int32(int32(b.ExecutionTimeo
utSecs)), | 236 » » » ExecutionTimeoutSecs: proto.Uint32(uint32(b.ExecutionTim
eoutSecs)), |
| 237 Name: proto.String(name + *builderSuffix
), | 237 Name: proto.String(name + *builderSuffix
), |
| 238 Recipe: &buildbucket.Swarming_Recipe{ | 238 Recipe: &buildbucket.Swarming_Recipe{ |
| 239 Name: &recipeName, | 239 Name: &recipeName, |
| 240 Properties: properties, | 240 Properties: properties, |
| 241 PropertiesJ: propertiesJ, | 241 PropertiesJ: propertiesJ, |
| 242 }, | 242 }, |
| 243 }) | 243 }) |
| 244 } | 244 } |
| 245 | 245 |
| 246 sort.Sort(byCategoryThenName(out.Builders)) | 246 sort.Sort(byCategoryThenName(out.Builders)) |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 435 case a[i].GetCategory() < a[j].GetCategory(): | 435 case a[i].GetCategory() < a[j].GetCategory(): |
| 436 return true | 436 return true |
| 437 | 437 |
| 438 case a[i].GetCategory() > a[j].GetCategory(): | 438 case a[i].GetCategory() > a[j].GetCategory(): |
| 439 return false | 439 return false |
| 440 | 440 |
| 441 default: | 441 default: |
| 442 return a[i].GetName() < a[j].GetName() | 442 return a[i].GetName() < a[j].GetName() |
| 443 } | 443 } |
| 444 } | 444 } |
| OLD | NEW |