Fix BuilderConfig proto, only one BuildTarget.
Fix the BuilderConfig proto, there is only one BuildTarget per
BuilderConfig.
BUG=None
TEST=./generate.sh
Change-Id: I963c3a2cde6299bd9999953ba51311d2b70158cf
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/infra/proto/+/2401907
Reviewed-by: Andrew Lamb <andrewlamb@chromium.org>
Reviewed-by: Mike Nichols <mikenichols@chromium.org>
Commit-Queue: David Burger <dburger@chromium.org>
Tested-by: David Burger <dburger@chromium.org>
diff --git a/go/prototype/builder_config.pb.go b/go/prototype/builder_config.pb.go
index 8230b3e..90d9756 100644
--- a/go/prototype/builder_config.pb.go
+++ b/go/prototype/builder_config.pb.go
@@ -26,10 +26,10 @@
// Whether this builder should be considered criticial.
Critical bool `protobuf:"varint,1,opt,name=critical,proto3" json:"critical,omitempty"`
// Defines the build target for this builder config.
- BuildTargets []*prototype.BuildTarget `protobuf:"bytes,2,rep,name=build_targets,json=buildTargets,proto3" json:"build_targets,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
+ BuildTarget *prototype.BuildTarget `protobuf:"bytes,2,opt,name=build_target,json=buildTarget,proto3" json:"build_target,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
}
func (m *BuilderConfig) Reset() { *m = BuilderConfig{} }
@@ -64,9 +64,9 @@
return false
}
-func (m *BuilderConfig) GetBuildTargets() []*prototype.BuildTarget {
+func (m *BuilderConfig) GetBuildTarget() *prototype.BuildTarget {
if m != nil {
- return m.BuildTargets
+ return m.BuildTarget
}
return nil
}
@@ -78,17 +78,17 @@
func init() { proto.RegisterFile("prototype/builder_config.proto", fileDescriptor_3f63408d3c1e26ca) }
var fileDescriptor_3f63408d3c1e26ca = []byte{
- // 182 bytes of a gzipped FileDescriptorProto
+ // 180 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2b, 0x28, 0xca, 0x2f,
0xc9, 0x2f, 0xa9, 0x2c, 0x48, 0xd5, 0x4f, 0x2a, 0xcd, 0xcc, 0x49, 0x49, 0x2d, 0x8a, 0x4f, 0xce,
0xcf, 0x4b, 0xcb, 0x4c, 0xd7, 0x03, 0x4b, 0x08, 0x71, 0xc2, 0xe5, 0xa5, 0xf4, 0x92, 0x33, 0x8a,
0xf2, 0x73, 0x33, 0x4b, 0x73, 0xf3, 0x8b, 0xf5, 0x21, 0x6a, 0xf4, 0xd1, 0x34, 0xc7, 0x97, 0x24,
- 0x16, 0xa5, 0xa7, 0x96, 0x40, 0xb4, 0x2a, 0x55, 0x71, 0xf1, 0x3a, 0x41, 0x8c, 0x74, 0x06, 0xab,
+ 0x16, 0xa5, 0xa7, 0x96, 0x40, 0xb4, 0x2a, 0x55, 0x70, 0xf1, 0x3a, 0x41, 0x8c, 0x74, 0x06, 0xab,
0x16, 0x92, 0xe2, 0xe2, 0x48, 0x2e, 0xca, 0x2c, 0xc9, 0x4c, 0x4e, 0xcc, 0x91, 0x60, 0x54, 0x60,
- 0xd4, 0xe0, 0x08, 0x82, 0xf3, 0x85, 0x7c, 0xb9, 0x78, 0x91, 0x8d, 0x28, 0x96, 0x60, 0x52, 0x60,
- 0xd6, 0xe0, 0x36, 0xd2, 0x40, 0xb2, 0x54, 0x0f, 0xd9, 0x61, 0x20, 0x4b, 0xf5, 0xc0, 0xc6, 0x87,
- 0x80, 0x35, 0x04, 0xf1, 0x24, 0x21, 0x38, 0xc5, 0x4e, 0xa6, 0x51, 0xc6, 0xe9, 0xf9, 0x70, 0xbd,
- 0x7a, 0xf9, 0x45, 0xe9, 0xfa, 0x48, 0xae, 0xcf, 0xcc, 0x4b, 0x2b, 0x4a, 0x84, 0x38, 0x5e, 0x3f,
- 0x3d, 0x1f, 0xe1, 0x8b, 0x24, 0x36, 0x30, 0xd3, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0xec, 0xdc,
- 0x0a, 0x52, 0x16, 0x01, 0x00, 0x00,
+ 0xd4, 0xe0, 0x08, 0x82, 0xf3, 0x85, 0xbc, 0xb9, 0x78, 0x90, 0x8d, 0x90, 0x60, 0x52, 0x60, 0xd4,
+ 0xe0, 0x36, 0xd2, 0x40, 0xb2, 0x53, 0x0f, 0xd9, 0x5d, 0x20, 0x3b, 0xf5, 0xc0, 0xa6, 0x87, 0x80,
+ 0xd5, 0x07, 0x71, 0x27, 0x21, 0x38, 0x4e, 0xa6, 0x51, 0xc6, 0xe9, 0xf9, 0x70, 0xad, 0x7a, 0xf9,
+ 0x45, 0xe9, 0xfa, 0x48, 0x6e, 0xcf, 0xcc, 0x4b, 0x2b, 0x4a, 0x84, 0x38, 0x5d, 0x3f, 0x3d, 0x1f,
+ 0xe1, 0x87, 0x24, 0x36, 0x30, 0xd3, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x88, 0xc1, 0xe0, 0xc9,
+ 0x14, 0x01, 0x00, 0x00,
}
diff --git a/src/prototype/builder_config.proto b/src/prototype/builder_config.proto
index 3dde0ea..a371cc0 100644
--- a/src/prototype/builder_config.proto
+++ b/src/prototype/builder_config.proto
@@ -17,5 +17,5 @@
bool critical = 1;
// Defines the build target for this builder config.
- repeated chromiumos.config.prototype.BuildTarget build_targets = 2;
+ chromiumos.config.prototype.BuildTarget build_target = 2;
}
