diff --git a/api/yolopb.proto b/api/yolopb.proto index 46cd6563..b7ac45f1 100644 --- a/api/yolopb.proto +++ b/api/yolopb.proto @@ -124,6 +124,7 @@ message MetadataOverride { string branch = 11; string has_commit_id = 103 [(gogoproto.customname) = "HasCommitID"]; string has_project_id = 105 [(gogoproto.customname) = "HasProjectID"]; + string has_mergerequest_id = 107 [(gogoproto.customname) = "HasMergeRequestID"]; } message Build { @@ -150,8 +151,10 @@ message Build { string raw_branch = 21; Commit has_raw_commit = 22; Project has_raw_project = 23; - string has_raw_commit_id = 24 [(gogoproto.customname) = "HasRawCommitID"]; - string has_raw_project_id = 25 [(gogoproto.customname) = "HasRawProjectID"]; + MergeRequest has_raw_mergerequest = 24; + string has_raw_commit_id = 25 [(gogoproto.customname) = "HasRawCommitID"]; + string has_raw_project_id = 26 [(gogoproto.customname) = "HasRawProjectID"]; + string has_raw_mergerequest_id = 27 [(gogoproto.customname) = "HasRawMergerequestID"]; repeated Artifact has_artifacts = 101 [(gogoproto.moretags) = "gorm:\"foreignkey:HasBuildID\""]; Commit has_commit = 102; diff --git a/go/gen.sum b/go/gen.sum index 3235921c..d795dff9 100644 --- a/go/gen.sum +++ b/go/gen.sum @@ -1,2 +1,2 @@ -ae2292c81245f9bea81225532654a9787dd8dd79 ../api/yolopb.proto d9b059a1afc43827a435da383eb09f7e8c5d3ce5 Makefile +e6bc4de5963f679f642d8236e32c06e82e35ad70 ../api/yolopb.proto diff --git a/go/pkg/yolopb/yolopb.pb.go b/go/pkg/yolopb/yolopb.pb.go index 54a0360b..ca1e422c 100644 --- a/go/pkg/yolopb/yolopb.pb.go +++ b/go/pkg/yolopb/yolopb.pb.go @@ -1019,9 +1019,10 @@ func (m *BuildListFilters_Response) GetProjects() []*Project { } type MetadataOverride struct { - Branch string `protobuf:"bytes,11,opt,name=branch,proto3" json:"branch,omitempty"` - HasCommitID string `protobuf:"bytes,103,opt,name=has_commit_id,json=hasCommitId,proto3" json:"has_commit_id,omitempty"` - HasProjectID string `protobuf:"bytes,105,opt,name=has_project_id,json=hasProjectId,proto3" json:"has_project_id,omitempty"` + Branch string `protobuf:"bytes,11,opt,name=branch,proto3" json:"branch,omitempty"` + HasCommitID string `protobuf:"bytes,103,opt,name=has_commit_id,json=hasCommitId,proto3" json:"has_commit_id,omitempty"` + HasProjectID string `protobuf:"bytes,105,opt,name=has_project_id,json=hasProjectId,proto3" json:"has_project_id,omitempty"` + HasMergeRequestID string `protobuf:"bytes,107,opt,name=has_mergerequest_id,json=hasMergerequestId,proto3" json:"has_mergerequest_id,omitempty"` } func (m *MetadataOverride) Reset() { *m = MetadataOverride{} } @@ -1078,34 +1079,43 @@ func (m *MetadataOverride) GetHasProjectID() string { return "" } +func (m *MetadataOverride) GetHasMergeRequestID() string { + if m != nil { + return m.HasMergeRequestID + } + return "" +} + type Build struct { - ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" gorm:"primary_key"` - YoloID string `protobuf:"bytes,2,opt,name=yolo_id,json=yoloId,proto3" json:"yolo_id,omitempty"` - CreatedAt *time.Time `protobuf:"bytes,3,opt,name=created_at,json=createdAt,proto3,stdtime" json:"created_at,omitempty"` - UpdatedAt *time.Time `protobuf:"bytes,4,opt,name=updated_at,json=updatedAt,proto3,stdtime" json:"updated_at,omitempty"` - State Build_State `protobuf:"varint,5,opt,name=state,proto3,enum=yolo.Build_State" json:"state,omitempty"` - CompletedAt *time.Time `protobuf:"bytes,6,opt,name=completed_at,json=completedAt,proto3,stdtime" json:"completed_at,omitempty"` - Message string `protobuf:"bytes,7,opt,name=message,proto3" json:"message,omitempty"` - StartedAt *time.Time `protobuf:"bytes,8,opt,name=started_at,json=startedAt,proto3,stdtime" json:"started_at,omitempty"` - FinishedAt *time.Time `protobuf:"bytes,9,opt,name=finished_at,json=finishedAt,proto3,stdtime" json:"finished_at,omitempty"` - CommitURL string `protobuf:"bytes,10,opt,name=commit_url,json=commitUrl,proto3" json:"commit_url,omitempty"` - Branch string `protobuf:"bytes,11,opt,name=branch,proto3" json:"branch,omitempty"` - Driver Driver `protobuf:"varint,12,opt,name=driver,proto3,enum=yolo.Driver" json:"driver,omitempty"` - ShortID string `protobuf:"bytes,13,opt,name=short_id,json=shortId,proto3" json:"short_id,omitempty"` - VCSTag string `protobuf:"bytes,14,opt,name=vcs_tag,json=vcsTag,proto3" json:"vcs_tag,omitempty"` - VCSTagURL string `protobuf:"bytes,15,opt,name=vcs_tag_url,json=vcsTagUrl,proto3" json:"vcs_tag_url,omitempty"` - RawBranch string `protobuf:"bytes,21,opt,name=raw_branch,json=rawBranch,proto3" json:"raw_branch,omitempty"` - HasRawCommit *Commit `protobuf:"bytes,22,opt,name=has_raw_commit,json=hasRawCommit,proto3" json:"has_raw_commit,omitempty"` - HasRawProject *Project `protobuf:"bytes,23,opt,name=has_raw_project,json=hasRawProject,proto3" json:"has_raw_project,omitempty"` - HasRawCommitID string `protobuf:"bytes,24,opt,name=has_raw_commit_id,json=hasRawCommitId,proto3" json:"has_raw_commit_id,omitempty"` - HasRawProjectID string `protobuf:"bytes,25,opt,name=has_raw_project_id,json=hasRawProjectId,proto3" json:"has_raw_project_id,omitempty"` - HasArtifacts []*Artifact `protobuf:"bytes,101,rep,name=has_artifacts,json=hasArtifacts,proto3" json:"has_artifacts,omitempty" gorm:"foreignkey:HasBuildID"` - HasCommit *Commit `protobuf:"bytes,102,opt,name=has_commit,json=hasCommit,proto3" json:"has_commit,omitempty"` - HasCommitID string `protobuf:"bytes,103,opt,name=has_commit_id,json=hasCommitId,proto3" json:"has_commit_id,omitempty"` - HasProject *Project `protobuf:"bytes,104,opt,name=has_project,json=hasProject,proto3" json:"has_project,omitempty"` - HasProjectID string `protobuf:"bytes,105,opt,name=has_project_id,json=hasProjectId,proto3" json:"has_project_id,omitempty"` - HasMergerequest *MergeRequest `protobuf:"bytes,106,opt,name=has_mergerequest,json=hasMergerequest,proto3" json:"has_mergerequest,omitempty"` - HasMergerequestID string `protobuf:"bytes,107,opt,name=has_mergerequest_id,json=hasMergerequestId,proto3" json:"has_mergerequest_id,omitempty"` + ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" gorm:"primary_key"` + YoloID string `protobuf:"bytes,2,opt,name=yolo_id,json=yoloId,proto3" json:"yolo_id,omitempty"` + CreatedAt *time.Time `protobuf:"bytes,3,opt,name=created_at,json=createdAt,proto3,stdtime" json:"created_at,omitempty"` + UpdatedAt *time.Time `protobuf:"bytes,4,opt,name=updated_at,json=updatedAt,proto3,stdtime" json:"updated_at,omitempty"` + State Build_State `protobuf:"varint,5,opt,name=state,proto3,enum=yolo.Build_State" json:"state,omitempty"` + CompletedAt *time.Time `protobuf:"bytes,6,opt,name=completed_at,json=completedAt,proto3,stdtime" json:"completed_at,omitempty"` + Message string `protobuf:"bytes,7,opt,name=message,proto3" json:"message,omitempty"` + StartedAt *time.Time `protobuf:"bytes,8,opt,name=started_at,json=startedAt,proto3,stdtime" json:"started_at,omitempty"` + FinishedAt *time.Time `protobuf:"bytes,9,opt,name=finished_at,json=finishedAt,proto3,stdtime" json:"finished_at,omitempty"` + CommitURL string `protobuf:"bytes,10,opt,name=commit_url,json=commitUrl,proto3" json:"commit_url,omitempty"` + Branch string `protobuf:"bytes,11,opt,name=branch,proto3" json:"branch,omitempty"` + Driver Driver `protobuf:"varint,12,opt,name=driver,proto3,enum=yolo.Driver" json:"driver,omitempty"` + ShortID string `protobuf:"bytes,13,opt,name=short_id,json=shortId,proto3" json:"short_id,omitempty"` + VCSTag string `protobuf:"bytes,14,opt,name=vcs_tag,json=vcsTag,proto3" json:"vcs_tag,omitempty"` + VCSTagURL string `protobuf:"bytes,15,opt,name=vcs_tag_url,json=vcsTagUrl,proto3" json:"vcs_tag_url,omitempty"` + RawBranch string `protobuf:"bytes,21,opt,name=raw_branch,json=rawBranch,proto3" json:"raw_branch,omitempty"` + HasRawCommit *Commit `protobuf:"bytes,22,opt,name=has_raw_commit,json=hasRawCommit,proto3" json:"has_raw_commit,omitempty"` + HasRawProject *Project `protobuf:"bytes,23,opt,name=has_raw_project,json=hasRawProject,proto3" json:"has_raw_project,omitempty"` + HasRawMergerequest *MergeRequest `protobuf:"bytes,24,opt,name=has_raw_mergerequest,json=hasRawMergerequest,proto3" json:"has_raw_mergerequest,omitempty"` + HasRawCommitID string `protobuf:"bytes,25,opt,name=has_raw_commit_id,json=hasRawCommitId,proto3" json:"has_raw_commit_id,omitempty"` + HasRawProjectID string `protobuf:"bytes,26,opt,name=has_raw_project_id,json=hasRawProjectId,proto3" json:"has_raw_project_id,omitempty"` + HasRawMergerequestID string `protobuf:"bytes,27,opt,name=has_raw_mergerequest_id,json=hasRawMergerequestId,proto3" json:"has_raw_mergerequest_id,omitempty"` + HasArtifacts []*Artifact `protobuf:"bytes,101,rep,name=has_artifacts,json=hasArtifacts,proto3" json:"has_artifacts,omitempty" gorm:"foreignkey:HasBuildID"` + HasCommit *Commit `protobuf:"bytes,102,opt,name=has_commit,json=hasCommit,proto3" json:"has_commit,omitempty"` + HasCommitID string `protobuf:"bytes,103,opt,name=has_commit_id,json=hasCommitId,proto3" json:"has_commit_id,omitempty"` + HasProject *Project `protobuf:"bytes,104,opt,name=has_project,json=hasProject,proto3" json:"has_project,omitempty"` + HasProjectID string `protobuf:"bytes,105,opt,name=has_project_id,json=hasProjectId,proto3" json:"has_project_id,omitempty"` + HasMergerequest *MergeRequest `protobuf:"bytes,106,opt,name=has_mergerequest,json=hasMergerequest,proto3" json:"has_mergerequest,omitempty"` + HasMergerequestID string `protobuf:"bytes,107,opt,name=has_mergerequest_id,json=hasMergerequestId,proto3" json:"has_mergerequest_id,omitempty"` } func (m *Build) Reset() { *m = Build{} } @@ -1267,6 +1277,13 @@ func (m *Build) GetHasRawProject() *Project { return nil } +func (m *Build) GetHasRawMergerequest() *MergeRequest { + if m != nil { + return m.HasRawMergerequest + } + return nil +} + func (m *Build) GetHasRawCommitID() string { if m != nil { return m.HasRawCommitID @@ -1281,6 +1298,13 @@ func (m *Build) GetHasRawProjectID() string { return "" } +func (m *Build) GetHasRawMergerequestID() string { + if m != nil { + return m.HasRawMergerequestID + } + return "" +} + func (m *Build) GetHasArtifacts() []*Artifact { if m != nil { return m.HasArtifacts @@ -2536,193 +2560,196 @@ func init() { func init() { proto.RegisterFile("yolopb.proto", fileDescriptor_a62788fcb176084a) } var fileDescriptor_a62788fcb176084a = []byte{ - // 2964 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0x4b, 0x6f, 0x23, 0xc7, - 0xf1, 0x5f, 0xbe, 0x39, 0x35, 0x24, 0x35, 0x6a, 0xed, 0xae, 0xc7, 0xda, 0x07, 0x65, 0xfa, 0x6f, - 0x7b, 0xbd, 0x5e, 0x49, 0xb6, 0xfc, 0xb7, 0x03, 0xaf, 0xe3, 0x24, 0xa4, 0xa8, 0x5d, 0x0d, 0xbc, + // 3011 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0xcb, 0x6f, 0x23, 0xc7, + 0xd1, 0x5f, 0xbe, 0x39, 0x35, 0x24, 0x35, 0x6a, 0xed, 0x63, 0xac, 0x7d, 0x50, 0xa6, 0x3f, 0xdb, + 0xeb, 0xf5, 0x4a, 0xb2, 0xe5, 0xcf, 0xfe, 0xe0, 0xf5, 0xe7, 0x24, 0xa4, 0xa8, 0x5d, 0x0d, 0xbc, 0x0f, 0x65, 0xa4, 0xb5, 0xe1, 0xe4, 0x40, 0x0c, 0x39, 0x2d, 0xb2, 0x2d, 0x72, 0x86, 0x9e, 0x19, - 0x4a, 0x90, 0x0f, 0x39, 0x18, 0xf9, 0x00, 0x06, 0x72, 0x08, 0x90, 0x9c, 0x92, 0x2f, 0x91, 0x43, + 0x4a, 0x90, 0x0f, 0x39, 0x18, 0xf9, 0x03, 0x0c, 0xe4, 0x96, 0x5b, 0xf2, 0x27, 0xe4, 0x92, 0x43, 0x90, 0x6b, 0xe0, 0x04, 0x08, 0x60, 0x20, 0x97, 0x9c, 0x98, 0x80, 0x0e, 0x90, 0x73, 0xf6, 0x90, - 0x83, 0x4f, 0x41, 0x57, 0xf7, 0x0c, 0x67, 0xa8, 0xf7, 0x06, 0xb9, 0x2c, 0x72, 0x11, 0xd4, 0xf5, - 0xec, 0xee, 0xa9, 0xfa, 0x55, 0x75, 0x37, 0xa1, 0x74, 0xe8, 0xf6, 0xdd, 0x61, 0x7b, 0x65, 0xe8, - 0xb9, 0x81, 0x4b, 0xb2, 0x7c, 0xb4, 0x78, 0xbd, 0xeb, 0xba, 0xdd, 0x3e, 0x5d, 0xb5, 0x86, 0x6c, - 0xd5, 0x72, 0x1c, 0x37, 0xb0, 0x02, 0xe6, 0x3a, 0xbe, 0x90, 0x59, 0x5c, 0xee, 0xb2, 0xa0, 0x37, - 0x6a, 0xaf, 0x74, 0xdc, 0xc1, 0x6a, 0xd7, 0xed, 0xba, 0xab, 0x48, 0x6e, 0x8f, 0x76, 0x71, 0x84, - 0x03, 0xfc, 0x4f, 0x8a, 0x57, 0xa5, 0xb1, 0x48, 0x2a, 0x60, 0x03, 0xea, 0x07, 0xd6, 0x60, 0x28, - 0x04, 0x6a, 0x37, 0x20, 0xbb, 0xc5, 0x9c, 0xee, 0xa2, 0x02, 0x05, 0x93, 0x7e, 0x36, 0xa2, 0x7e, - 0xb0, 0x08, 0x50, 0x34, 0xa9, 0x3f, 0x74, 0x1d, 0x9f, 0xd6, 0x7e, 0x95, 0x82, 0x4a, 0x93, 0xee, - 0x37, 0x47, 0x83, 0xe1, 0xe3, 0xf6, 0xa7, 0xb4, 0x13, 0xf8, 0x8b, 0x6b, 0x91, 0x24, 0x79, 0x0d, - 0xe6, 0x0e, 0x58, 0xd0, 0x6b, 0x0d, 0x3d, 0xda, 0x77, 0x2d, 0x9b, 0x39, 0x5d, 0x3d, 0xb5, 0x94, - 0xba, 0x55, 0x34, 0x2b, 0x9c, 0xbc, 0x15, 0x51, 0x17, 0x7f, 0x3c, 0x35, 0x49, 0x5e, 0x82, 0x5c, - 0xdb, 0x0a, 0x3a, 0x3d, 0x14, 0x55, 0xd7, 0xd4, 0x15, 0xbe, 0xea, 0x95, 0x06, 0x27, 0x99, 0x82, - 0x43, 0xee, 0x80, 0x62, 0xbb, 0x07, 0x0e, 0xd7, 0xf6, 0xf5, 0xf4, 0x52, 0xe6, 0x96, 0xba, 0x56, - 0x11, 0x62, 0x4d, 0x49, 0x36, 0xa7, 0x02, 0xb5, 0x5f, 0xa4, 0x21, 0xbf, 0x1d, 0x58, 0xc1, 0xc8, - 0x8f, 0xaf, 0xe2, 0xa7, 0xe9, 0x98, 0xcf, 0xab, 0x90, 0x1f, 0x0d, 0xf9, 0xd2, 0xd1, 0x69, 0xce, - 0x94, 0x23, 0x72, 0x05, 0xf2, 0x76, 0xbb, 0x45, 0x3d, 0x4f, 0x4f, 0x2f, 0xa5, 0x6e, 0x29, 0x66, - 0xce, 0x6e, 0x6f, 0x78, 0x1e, 0xa9, 0x82, 0xea, 0xb4, 0x5b, 0xd4, 0x09, 0x58, 0xc0, 0xa8, 0xaf, - 0x03, 0xea, 0x80, 0xd3, 0xde, 0x90, 0x14, 0x29, 0x30, 0xf4, 0x5c, 0xdc, 0x12, 0x5d, 0x0d, 0x05, - 0xb6, 0x24, 0x85, 0xdc, 0x00, 0x70, 0xda, 0xad, 0x8e, 0x3b, 0x18, 0xb0, 0xc0, 0xd7, 0x4b, 0xc8, - 0x57, 0x9c, 0xf6, 0xba, 0x20, 0x48, 0x7d, 0x8f, 0xf6, 0xa9, 0xe5, 0x53, 0x5f, 0x2f, 0x87, 0xfa, - 0xa6, 0xa4, 0x90, 0x6b, 0xa0, 0x38, 0xed, 0x56, 0x7b, 0xc4, 0xfa, 0xb6, 0xaf, 0x57, 0x90, 0x5d, - 0x74, 0xda, 0x0d, 0x1c, 0x93, 0xdb, 0x30, 0xef, 0xb4, 0x5b, 0x03, 0xea, 0x75, 0x69, 0xcb, 0x13, - 0xcb, 0xf5, 0xf5, 0x39, 0x14, 0x9a, 0x73, 0xda, 0x0f, 0x39, 0x5d, 0xee, 0x82, 0x5f, 0xfb, 0x36, - 0x07, 0x0a, 0xaa, 0x3d, 0x60, 0x7e, 0xb0, 0xf8, 0xdb, 0xdc, 0xf4, 0xe3, 0x5d, 0x86, 0x5c, 0x9f, - 0x0d, 0x58, 0x20, 0xb7, 0x44, 0x0c, 0xc8, 0x5d, 0xa8, 0x58, 0x5e, 0xc0, 0x76, 0xad, 0x4e, 0xd0, - 0xda, 0x63, 0x8e, 0xdc, 0xff, 0xca, 0xda, 0x82, 0xd8, 0xff, 0xba, 0xe4, 0xad, 0x7c, 0xc8, 0x1c, - 0xdb, 0x2c, 0x87, 0xa2, 0x7c, 0xe4, 0x93, 0x57, 0x00, 0xbf, 0x7b, 0x2b, 0xa4, 0xfa, 0x7a, 0x06, - 0xa3, 0xa1, 0xcc, 0xa9, 0xa1, 0xa6, 0x4f, 0x5e, 0x85, 0x22, 0x2e, 0xac, 0xc5, 0x6c, 0x3d, 0xbb, - 0x94, 0xb9, 0xa5, 0x34, 0xd4, 0xc9, 0xb8, 0x5a, 0xc0, 0x59, 0x1a, 0x4d, 0xb3, 0x80, 0x4c, 0xc3, - 0x26, 0x77, 0x00, 0xe4, 0x0e, 0x73, 0xc9, 0x1c, 0x4a, 0x96, 0x27, 0xe3, 0xaa, 0x22, 0x77, 0xd9, - 0x68, 0x9a, 0x8a, 0x14, 0x30, 0x6c, 0xb2, 0x0a, 0x6a, 0x34, 0x71, 0x66, 0xeb, 0x79, 0x14, 0xaf, - 0x4c, 0xc6, 0x55, 0x08, 0x3d, 0x1b, 0x4d, 0x13, 0x42, 0x11, 0x54, 0x28, 0x89, 0x69, 0xd8, 0x1e, - 0xdb, 0xa7, 0x9e, 0x5e, 0xc0, 0x75, 0x96, 0x64, 0x9c, 0x21, 0xcd, 0x54, 0x51, 0x42, 0x0c, 0xc8, - 0x1a, 0x88, 0x61, 0xcb, 0x0f, 0xac, 0x80, 0xea, 0x45, 0x94, 0x9f, 0x97, 0xe1, 0xcb, 0x19, 0x2b, - 0x3c, 0x0a, 0xa9, 0x09, 0x28, 0x85, 0xff, 0x93, 0xf7, 0x61, 0x0e, 0xbf, 0x93, 0xfc, 0x4c, 0x7c, - 0x66, 0x0a, 0xce, 0x8c, 0x4c, 0xc6, 0xd5, 0x4a, 0xfc, 0x53, 0x19, 0x4d, 0xb3, 0x12, 0x17, 0x35, - 0x6c, 0xf2, 0x08, 0xae, 0x26, 0x94, 0xad, 0x51, 0xd0, 0x73, 0x3d, 0x6e, 0x03, 0xd0, 0x86, 0x3e, - 0x19, 0x57, 0x2f, 0xc7, 0x6d, 0xd4, 0x51, 0xc0, 0x68, 0x9a, 0x97, 0xe3, 0x7a, 0x92, 0x6a, 0x93, - 0x37, 0x60, 0x1e, 0xbf, 0x4f, 0x9c, 0x89, 0xb1, 0x5b, 0x34, 0x35, 0xce, 0x78, 0x18, 0xa3, 0x93, - 0xfb, 0x40, 0x12, 0xce, 0xc5, 0xa2, 0x4b, 0xb8, 0x68, 0x5d, 0x2c, 0x3a, 0xee, 0x5a, 0xae, 0x7d, - 0x3e, 0xae, 0x23, 0xb6, 0xe0, 0x2a, 0xe4, 0xdb, 0x9e, 0xe5, 0x74, 0x7a, 0x7a, 0x99, 0xcf, 0xda, - 0x94, 0x23, 0xf2, 0x26, 0x5c, 0xc6, 0xd9, 0x38, 0x6e, 0x72, 0x42, 0x15, 0x9c, 0x10, 0xe1, 0xbc, - 0x47, 0x6e, 0x7c, 0x4a, 0x8b, 0xab, 0xb1, 0x8c, 0x7e, 0x19, 0xf2, 0x32, 0x3b, 0x52, 0x88, 0x0f, - 0x6a, 0xec, 0x3b, 0x98, 0x92, 0x55, 0xfb, 0x09, 0x68, 0x51, 0xec, 0xdf, 0x63, 0xfd, 0x80, 0x7a, - 0x09, 0x88, 0x68, 0xc5, 0xec, 0xdd, 0x82, 0x62, 0x94, 0xef, 0xc2, 0xa2, 0x8c, 0x04, 0xcc, 0xf9, - 0x43, 0x33, 0xe2, 0x92, 0xd7, 0xa1, 0x18, 0x25, 0xbe, 0xc0, 0xa6, 0xb2, 0x90, 0x94, 0x61, 0x69, - 0x46, 0xec, 0xda, 0xcf, 0x53, 0xa0, 0x3d, 0xa4, 0x81, 0x65, 0x5b, 0x81, 0xf5, 0x78, 0x9f, 0x7a, - 0x1e, 0xb3, 0xe3, 0xfb, 0xa1, 0x22, 0xe6, 0x84, 0xfb, 0xf1, 0x36, 0x94, 0x7b, 0x96, 0x2f, 0x31, - 0x83, 0x7f, 0xe4, 0x2e, 0x67, 0x37, 0xe6, 0x26, 0xe3, 0xaa, 0xba, 0x69, 0xf9, 0x02, 0x3a, 0x8c, - 0xa6, 0xa9, 0xf6, 0xa2, 0x81, 0x4d, 0xde, 0x85, 0x0a, 0x57, 0x8a, 0xe5, 0x09, 0x43, 0x2d, 0x6d, - 0x32, 0xae, 0x96, 0x36, 0x2d, 0x7f, 0x9a, 0x2a, 0xa5, 0xde, 0x74, 0x64, 0xd7, 0x7e, 0x59, 0x82, - 0x1c, 0x6e, 0x0d, 0xb9, 0x03, 0x69, 0x66, 0x23, 0x06, 0x28, 0x8d, 0xeb, 0x93, 0x71, 0x35, 0x6d, - 0x34, 0x9f, 0x8e, 0xab, 0xa4, 0xeb, 0x7a, 0x83, 0xbb, 0xb5, 0xa1, 0xc7, 0x06, 0x96, 0x77, 0xd8, - 0xda, 0xa3, 0x87, 0x35, 0x33, 0xcd, 0x6c, 0xf2, 0x32, 0x14, 0xf8, 0x5a, 0xb9, 0x23, 0x44, 0xcc, - 0x06, 0x4c, 0xc6, 0xd5, 0xfc, 0x27, 0x6e, 0xdf, 0x35, 0x9a, 0x66, 0x9e, 0xb3, 0x0c, 0x9b, 0xac, - 0x03, 0x74, 0x3c, 0x6a, 0x05, 0xd4, 0x6e, 0x59, 0x01, 0x62, 0x80, 0xba, 0xb6, 0xb8, 0x22, 0x2a, - 0xd1, 0x4a, 0x58, 0x89, 0x56, 0x76, 0xc2, 0x4a, 0xd4, 0x28, 0x7e, 0x35, 0xae, 0xa6, 0xbe, 0xfc, - 0x6b, 0x35, 0x65, 0x2a, 0x52, 0xaf, 0x1e, 0x70, 0x23, 0xa3, 0xa1, 0x1d, 0x1a, 0xc9, 0x5e, 0xc4, - 0x88, 0xd4, 0xab, 0xf3, 0x02, 0x95, 0x13, 0x71, 0x9b, 0x5b, 0x4a, 0x1d, 0x9f, 0xac, 0x82, 0x4f, - 0xee, 0x43, 0xa9, 0xe3, 0x0e, 0x86, 0x7d, 0x2a, 0xfd, 0xe5, 0x2f, 0xe0, 0x4f, 0x8d, 0x34, 0xeb, - 0x01, 0xd1, 0xa1, 0x30, 0xa0, 0xbe, 0x6f, 0x75, 0xa9, 0x5e, 0xc0, 0xcf, 0x1b, 0x0e, 0xf9, 0x82, - 0xfc, 0xc0, 0xf2, 0xa4, 0x83, 0xe2, 0x45, 0x16, 0x24, 0xf5, 0xea, 0x01, 0xd9, 0x00, 0x75, 0x97, - 0x39, 0xcc, 0xef, 0x09, 0x2b, 0xca, 0x05, 0xac, 0x40, 0xa8, 0x58, 0x0f, 0x38, 0xb4, 0xca, 0x38, - 0x1b, 0x79, 0x7d, 0xac, 0x6f, 0x12, 0x5a, 0x45, 0x60, 0x3d, 0x31, 0x1f, 0x98, 0x8a, 0x10, 0x78, - 0xe2, 0xf5, 0x4f, 0x8c, 0xd8, 0xff, 0x83, 0xbc, 0xc4, 0xce, 0x12, 0x6e, 0x6f, 0x12, 0x3b, 0x25, - 0x8f, 0xc3, 0xbd, 0xdf, 0x73, 0x3d, 0x0c, 0xce, 0x32, 0x7a, 0x42, 0xb8, 0xdf, 0xe6, 0x34, 0x0e, - 0xf7, 0xc8, 0x34, 0x30, 0xb4, 0xf6, 0x3b, 0x7e, 0x2b, 0xb0, 0xba, 0x08, 0x01, 0x32, 0xb4, 0x3e, - 0x5a, 0xdf, 0xde, 0xb1, 0xba, 0x66, 0x7e, 0xbf, 0xe3, 0xef, 0x58, 0x5d, 0xb2, 0x0c, 0xaa, 0x14, - 0xc2, 0x99, 0xcf, 0x4d, 0x67, 0x2e, 0x04, 0x71, 0xe6, 0x42, 0x96, 0xcf, 0xfc, 0x06, 0x80, 0x67, - 0x1d, 0xb4, 0xe4, 0xec, 0xaf, 0xe0, 0xec, 0x15, 0xcf, 0x3a, 0x68, 0x88, 0x05, 0xac, 0x89, 0xec, - 0xe1, 0x22, 0x62, 0xb5, 0xfa, 0x55, 0xdc, 0x50, 0xb9, 0x10, 0xb1, 0x19, 0x98, 0x39, 0xa6, 0x75, - 0x20, 0x46, 0xe4, 0x1d, 0x98, 0x0b, 0x75, 0x64, 0xd6, 0xe9, 0x2f, 0xa0, 0xd2, 0x0c, 0x0a, 0x94, - 0x85, 0x96, 0x1c, 0x92, 0x0f, 0x60, 0x3e, 0xe9, 0x8a, 0x6f, 0x87, 0x8e, 0xd3, 0xc7, 0x52, 0xb0, - 0x19, 0xf3, 0xc1, 0x4b, 0x41, 0xdc, 0xa7, 0x61, 0x93, 0x1f, 0x00, 0x99, 0xf1, 0xca, 0xf5, 0x5f, - 0x44, 0xfd, 0x85, 0xc9, 0xb8, 0x3a, 0xb7, 0x19, 0xf7, 0x66, 0x34, 0xcd, 0xb9, 0x84, 0x7b, 0xc3, - 0x26, 0x4f, 0x04, 0xbc, 0x4c, 0x6b, 0x33, 0x8d, 0xf7, 0x55, 0x61, 0x8d, 0x6c, 0x2c, 0x3d, 0x1d, - 0x57, 0xaf, 0x8b, 0xe4, 0xdf, 0x75, 0x3d, 0xca, 0xba, 0xce, 0x1e, 0x3d, 0xbc, 0xbb, 0x69, 0xf9, - 0xb2, 0x3c, 0xd7, 0x70, 0x3b, 0xa6, 0xc5, 0xfc, 0x0d, 0x80, 0x29, 0x6a, 0xe9, 0xbb, 0xc7, 0x6c, - 0x9f, 0x12, 0xe1, 0xd5, 0xb3, 0x41, 0xdc, 0x0a, 0xa8, 0x31, 0x88, 0xd3, 0x7b, 0xc7, 0x6d, 0x36, - 0x4c, 0xc1, 0xed, 0x59, 0x21, 0x91, 0x7c, 0x00, 0x1a, 0xd7, 0x4b, 0xd4, 0xa2, 0x4f, 0xd1, 0x19, - 0x39, 0x5a, 0xee, 0x70, 0x7f, 0x13, 0xf5, 0x72, 0x03, 0x16, 0x66, 0xd5, 0xb9, 0xef, 0x3d, 0xf4, - 0x7d, 0x65, 0x32, 0xae, 0xce, 0x6f, 0x26, 0x35, 0x8c, 0xa6, 0x39, 0x3f, 0x63, 0xc4, 0xb0, 0x6b, - 0x5f, 0xa4, 0x20, 0x27, 0xea, 0xa6, 0x06, 0xa5, 0x27, 0xce, 0x9e, 0xe3, 0x1e, 0x38, 0x38, 0xd6, - 0x2e, 0x11, 0x15, 0x0a, 0xe6, 0xc8, 0x71, 0x98, 0xd3, 0xd5, 0x52, 0x04, 0x20, 0x7f, 0xcf, 0x62, - 0x7d, 0x6a, 0x6b, 0x69, 0xfe, 0xff, 0x96, 0xe5, 0xfb, 0xd4, 0xd6, 0x32, 0xa4, 0x04, 0xc5, 0x75, - 0xcb, 0xe9, 0x50, 0xce, 0xc9, 0x92, 0x32, 0x28, 0xdb, 0x9d, 0x1e, 0xb5, 0x47, 0x7c, 0x98, 0xe3, - 0x16, 0xb6, 0xf7, 0xd8, 0x70, 0x48, 0x6d, 0x2d, 0xcf, 0xb5, 0x1e, 0xb9, 0x81, 0x39, 0x72, 0xb4, - 0x02, 0xd7, 0xe2, 0x98, 0x61, 0xbb, 0xa3, 0x40, 0x2b, 0xd6, 0xfe, 0x94, 0xe5, 0x45, 0x12, 0x5b, - 0xd1, 0xe7, 0xbb, 0x3e, 0xc4, 0xd0, 0x3a, 0x97, 0x44, 0xeb, 0x29, 0xb6, 0xe5, 0x4f, 0xc1, 0xb6, - 0x24, 0x8e, 0x16, 0xce, 0xc0, 0xd1, 0x38, 0x12, 0x16, 0x4f, 0x41, 0xc2, 0xb7, 0xcf, 0x95, 0xaa, - 0xff, 0x49, 0x22, 0xce, 0xe4, 0x54, 0xf7, 0xac, 0x9c, 0x3a, 0x2e, 0x37, 0x7a, 0xe7, 0xce, 0x8d, - 0xda, 0x6f, 0xb2, 0x90, 0x97, 0x9e, 0xff, 0x17, 0x4e, 0xa7, 0x84, 0xd3, 0xb4, 0xd0, 0x16, 0x12, - 0x85, 0xf6, 0x4d, 0x28, 0x21, 0xfa, 0x87, 0xe7, 0x45, 0x1a, 0x6f, 0x3b, 0x65, 0xa2, 0x22, 0x68, - 0x46, 0xe7, 0xc7, 0xdb, 0x22, 0x1a, 0x64, 0x8b, 0xbc, 0x7b, 0xb4, 0x45, 0xe6, 0xc1, 0x20, 0x8f, - 0x93, 0x17, 0x0d, 0x06, 0x19, 0x69, 0xe2, 0x34, 0x22, 0xc3, 0x20, 0xd9, 0x2c, 0x73, 0xe3, 0xe2, - 0xd4, 0x71, 0x6c, 0xe4, 0xb0, 0xf3, 0x47, 0xce, 0x3f, 0x14, 0x28, 0xc5, 0x25, 0x9e, 0xef, 0xf8, - 0xa9, 0x83, 0x82, 0x1b, 0x85, 0x36, 0x72, 0x17, 0xb0, 0x51, 0x14, 0x6a, 0x75, 0x3c, 0xd5, 0x07, - 0x2c, 0xe8, 0x53, 0x8c, 0x33, 0xc5, 0x14, 0x83, 0x53, 0xba, 0xd2, 0x69, 0x60, 0x16, 0xcf, 0x15, - 0x98, 0x4a, 0x22, 0x30, 0x57, 0xc2, 0xfe, 0x1a, 0x50, 0xf9, 0xe4, 0x73, 0xa1, 0x6c, 0xb3, 0x93, - 0x78, 0xa9, 0x9e, 0x81, 0x97, 0x77, 0x00, 0x84, 0x1f, 0x94, 0x2e, 0x4d, 0xa5, 0x45, 0xfb, 0x86, - 0xd2, 0x42, 0x60, 0x16, 0x5d, 0x4f, 0xeb, 0x33, 0x97, 0x20, 0xcf, 0xfc, 0xd6, 0x01, 0x1b, 0x8a, - 0x93, 0x66, 0x43, 0x99, 0x8c, 0xab, 0x39, 0xc3, 0xff, 0xd8, 0xd8, 0x32, 0x73, 0xcc, 0xff, 0x98, - 0x0d, 0xff, 0xcb, 0xe9, 0xb6, 0x23, 0xd1, 0xdd, 0xf7, 0x59, 0xd7, 0xa1, 0xd4, 0xd7, 0xbb, 0x47, - 0x8f, 0x9b, 0x8d, 0x97, 0x9e, 0x8e, 0xab, 0x37, 0x44, 0x50, 0x0f, 0x2c, 0xe7, 0x70, 0x8d, 0xff, - 0xb9, 0x3b, 0xf0, 0xa6, 0x5a, 0xb2, 0x0f, 0x0b, 0x87, 0xa1, 0x55, 0x8f, 0xee, 0x33, 0x7a, 0x40, - 0x3d, 0x5f, 0xef, 0x5d, 0xc0, 0x6a, 0xa4, 0x25, 0xac, 0x9a, 0xe1, 0x70, 0x16, 0x1a, 0xd8, 0xc5, - 0x7b, 0xaf, 0x4f, 0xcf, 0xd5, 0x7b, 0x25, 0x21, 0x65, 0xef, 0x74, 0x48, 0x09, 0xcb, 0x63, 0x74, - 0x1b, 0xd2, 0x4f, 0x74, 0x91, 0xd1, 0x25, 0x88, 0x1a, 0xa9, 0x4c, 0x3d, 0xc8, 0xf2, 0x38, 0xb8, - 0x60, 0x9f, 0xea, 0x9c, 0xdd, 0xa7, 0xd6, 0x3e, 0x38, 0xb9, 0x71, 0x03, 0xc8, 0x3f, 0x1e, 0x52, - 0x87, 0xda, 0xa2, 0x6f, 0x5b, 0xef, 0xbb, 0x7e, 0xd8, 0xb7, 0x61, 0xae, 0xd8, 0x5a, 0xa6, 0xf6, - 0xeb, 0x1c, 0x14, 0xc2, 0x6d, 0x7c, 0xae, 0x41, 0x6e, 0x8a, 0x38, 0xb9, 0x53, 0x10, 0x87, 0x40, - 0xd6, 0xb1, 0x06, 0x21, 0x8c, 0xe1, 0xff, 0x64, 0x09, 0x54, 0x9b, 0xfa, 0x1d, 0x8f, 0x0d, 0x03, - 0xe6, 0x3a, 0x12, 0xc9, 0xe2, 0xa4, 0x67, 0xeb, 0x9c, 0x2e, 0x92, 0xbc, 0xcb, 0x22, 0x21, 0xc2, - 0x8b, 0xdd, 0x44, 0xea, 0xca, 0x38, 0x82, 0x28, 0x28, 0xfc, 0x23, 0x48, 0xd2, 0x3b, 0x13, 0x49, - 0xbe, 0x2f, 0xce, 0x89, 0xf1, 0x7a, 0xe9, 0xeb, 0x0c, 0xd5, 0x8e, 0x2b, 0x98, 0xda, 0x4c, 0xc1, - 0xf4, 0xc9, 0xeb, 0xc0, 0xa7, 0xdb, 0x72, 0x0f, 0x1c, 0xea, 0xc9, 0xf3, 0xcb, 0xcc, 0x4d, 0x56, - 0xcf, 0xf2, 0x1f, 0x73, 0x6e, 0x38, 0x3b, 0x14, 0x9d, 0x9e, 0x55, 0xf0, 0xce, 0x74, 0x53, 0xca, - 0x18, 0x4d, 0x5c, 0x8f, 0xf8, 0xdf, 0xae, 0xfd, 0x2b, 0x0b, 0x79, 0x61, 0xe6, 0xf9, 0x8e, 0xd1, - 0x30, 0xfa, 0x72, 0xb1, 0xe8, 0x3b, 0xf7, 0x89, 0xc0, 0xda, 0xb7, 0x02, 0xcb, 0x9b, 0x3d, 0x11, - 0xd4, 0x91, 0x8a, 0x35, 0x4b, 0x08, 0xf0, 0x9a, 0xf5, 0x0a, 0x64, 0xf7, 0x98, 0x63, 0xcb, 0xda, - 0x3b, 0x1f, 0xff, 0x4e, 0xe2, 0x86, 0x1d, 0xd9, 0xb3, 0x81, 0xaf, 0x1c, 0x0d, 0x7c, 0xf9, 0x29, - 0xa3, 0x8b, 0x49, 0x7a, 0xdc, 0xc5, 0xa4, 0x3a, 0xc5, 0xdc, 0x23, 0x91, 0xbc, 0x7b, 0x46, 0x24, - 0x1f, 0x1b, 0x97, 0xdd, 0xf3, 0xc7, 0x65, 0xed, 0xbb, 0x90, 0xe5, 0x2b, 0x22, 0x73, 0xa0, 0x4a, - 0x74, 0xe4, 0x43, 0xed, 0x12, 0x29, 0x42, 0xf6, 0x89, 0x4f, 0x3d, 0x2d, 0xc5, 0x81, 0xf3, 0xb1, - 0xd7, 0xb5, 0x1c, 0xf6, 0x39, 0x3e, 0x79, 0x69, 0x69, 0x52, 0x80, 0x4c, 0xc3, 0x0d, 0xb4, 0x4c, - 0xed, 0x9f, 0x0a, 0x14, 0xc3, 0x8c, 0x7d, 0xbe, 0x43, 0xef, 0x1a, 0x28, 0xbb, 0xac, 0x4f, 0x5b, - 0x3e, 0xfb, 0x5c, 0xc4, 0x5f, 0xc6, 0x2c, 0x72, 0xc2, 0x36, 0xfb, 0x9c, 0x92, 0x1b, 0x00, 0x7d, - 0xb7, 0x63, 0xf5, 0x5b, 0x43, 0x2b, 0xe8, 0x49, 0x6c, 0x54, 0x90, 0xb2, 0x65, 0x05, 0x3d, 0xb2, - 0x06, 0xa5, 0xf0, 0x59, 0x2c, 0x16, 0x7e, 0x58, 0xb6, 0xc2, 0x87, 0x33, 0x1e, 0x80, 0x6a, 0x28, - 0xc4, 0x43, 0xf0, 0x1a, 0x28, 0x03, 0x36, 0xa0, 0xad, 0xe0, 0x70, 0x48, 0xc5, 0xa9, 0xd4, 0x2c, - 0x72, 0xc2, 0xce, 0xe1, 0x90, 0x92, 0x17, 0x79, 0x4f, 0x65, 0xbd, 0xd5, 0xf2, 0x47, 0x03, 0x19, - 0x75, 0x05, 0x3e, 0xde, 0x1e, 0x0d, 0xf8, 0x54, 0xfc, 0x9e, 0xb5, 0xf6, 0xce, 0xbb, 0xc8, 0x04, - 0x31, 0x15, 0x41, 0xe1, 0xec, 0xdb, 0x61, 0x67, 0xa8, 0x62, 0x68, 0x5f, 0x9e, 0x79, 0x3e, 0x4a, - 0x74, 0x85, 0xaf, 0xc9, 0x2c, 0x10, 0xb7, 0x88, 0xc7, 0xbe, 0x34, 0x89, 0x3c, 0x98, 0xa6, 0x60, - 0xf9, 0x94, 0x14, 0xac, 0x82, 0xda, 0x1e, 0x39, 0x76, 0x9f, 0xb6, 0x30, 0x87, 0xf1, 0x32, 0xd1, - 0x04, 0x41, 0x7a, 0xc4, 0x33, 0xf9, 0x15, 0xa8, 0x48, 0x81, 0x7d, 0xea, 0xf9, 0x3c, 0xa3, 0xf0, - 0x1e, 0xd1, 0x2c, 0x0b, 0xea, 0x47, 0x82, 0xc8, 0x91, 0x54, 0x8a, 0x31, 0x5b, 0xd7, 0x70, 0x2b, - 0x4b, 0x93, 0x71, 0xb5, 0xd8, 0x40, 0xa2, 0xd1, 0x34, 0x8b, 0x82, 0x6d, 0xd8, 0x31, 0x97, 0xac, - 0xe3, 0x3a, 0xfa, 0x7c, 0xdc, 0xa5, 0xd1, 0x71, 0x1d, 0x72, 0x4b, 0xa0, 0x32, 0xd6, 0x18, 0x9d, - 0x26, 0x1e, 0x3e, 0xb1, 0xc4, 0x14, 0xc3, 0x12, 0x13, 0x66, 0x72, 0xf4, 0x42, 0xb6, 0x9b, 0x00, - 0xe5, 0xf0, 0x91, 0x0c, 0x42, 0xf9, 0xe9, 0x05, 0x99, 0x2c, 0x32, 0xc9, 0xf3, 0x5b, 0x58, 0x63, - 0x60, 0x5a, 0x63, 0xc2, 0x26, 0x4d, 0xca, 0x73, 0x1f, 0xbd, 0x44, 0x93, 0x26, 0xe5, 0x64, 0x93, - 0x16, 0x8e, 0xec, 0xe4, 0xab, 0x2c, 0x3b, 0xe3, 0x55, 0x96, 0xfc, 0x3f, 0xcc, 0x45, 0x83, 0x56, - 0xc7, 0x1d, 0x39, 0xe2, 0x36, 0x2d, 0xd3, 0x50, 0x9f, 0x8e, 0xab, 0x05, 0xff, 0xb3, 0xfe, 0xdd, - 0xda, 0x72, 0xcd, 0xac, 0x44, 0x32, 0xeb, 0x5c, 0x84, 0x3c, 0x84, 0xab, 0x76, 0x3f, 0xaa, 0xdf, - 0x2d, 0xec, 0x6e, 0x45, 0x2c, 0xff, 0x41, 0xe4, 0xfb, 0x0b, 0x93, 0x71, 0x75, 0xa1, 0xf9, 0x20, - 0x8c, 0x8e, 0x6d, 0x14, 0xe0, 0x41, 0xbd, 0x60, 0xf7, 0x67, 0x88, 0x5e, 0x9f, 0x9f, 0x3e, 0x87, - 0x7d, 0xe6, 0x27, 0x0c, 0xfd, 0x31, 0x35, 0xbd, 0x75, 0xdd, 0x7a, 0xc0, 0xfc, 0x98, 0x8d, 0x0a, - 0x0a, 0x47, 0xea, 0xb5, 0xcd, 0x93, 0x5b, 0xba, 0x12, 0x14, 0xef, 0xc9, 0xfb, 0x74, 0x2d, 0xc5, - 0x71, 0xea, 0x11, 0x3d, 0xd0, 0xd2, 0x44, 0x81, 0xdc, 0x86, 0xe7, 0xb9, 0x9e, 0x96, 0x21, 0x2a, - 0x14, 0x9a, 0x14, 0x9f, 0x05, 0xb4, 0x6c, 0x6d, 0xed, 0x24, 0xf4, 0x2b, 0x40, 0xc6, 0xd8, 0xaa, - 0x0b, 0x13, 0xf5, 0xad, 0x0f, 0x05, 0xe6, 0x35, 0x1f, 0xde, 0xd7, 0x32, 0xb5, 0x6f, 0x53, 0x50, - 0x0c, 0x77, 0x96, 0xbc, 0x1f, 0x61, 0x5e, 0xa6, 0xf1, 0x46, 0x84, 0x79, 0x2f, 0x09, 0xcc, 0xdb, - 0x32, 0x8d, 0x87, 0x75, 0xf3, 0x93, 0xd6, 0x87, 0x1b, 0x9f, 0xbc, 0x5f, 0x7f, 0xb2, 0xf3, 0xb8, - 0x65, 0x3c, 0x5a, 0x37, 0x37, 0x1e, 0x6e, 0x3c, 0xda, 0x11, 0x10, 0x98, 0x44, 0xb7, 0xf4, 0xb3, - 0xa1, 0xdb, 0x5b, 0x22, 0x30, 0xc3, 0x6f, 0x23, 0xa3, 0x78, 0xb6, 0xb5, 0x52, 0x63, 0xad, 0x15, - 0x79, 0x4f, 0xdc, 0x95, 0xc7, 0xdf, 0x65, 0x45, 0x38, 0xcf, 0x4f, 0xc6, 0xd5, 0xf2, 0xe6, 0x54, - 0xd2, 0x68, 0xe2, 0x7d, 0x79, 0x34, 0xb4, 0x6b, 0xbf, 0x4b, 0x43, 0x0e, 0x7f, 0x13, 0x70, 0xae, - 0x97, 0x3e, 0x1e, 0x9b, 0xd3, 0xa6, 0x2f, 0x7d, 0x6c, 0xd3, 0x37, 0x15, 0x48, 0x3c, 0xe1, 0x65, - 0x4e, 0x7d, 0xc2, 0x4b, 0xbc, 0x0b, 0x66, 0xcf, 0x7a, 0x17, 0x8c, 0xfa, 0xbc, 0xdc, 0x71, 0x7d, - 0x5e, 0xc4, 0x26, 0xaf, 0x42, 0x21, 0xac, 0xbb, 0xf9, 0x63, 0xea, 0x6e, 0xc8, 0x24, 0xef, 0x41, - 0x65, 0xe6, 0x95, 0xbf, 0x70, 0x62, 0xc5, 0x2d, 0x0f, 0xe2, 0xef, 0xfe, 0xb7, 0x7f, 0x08, 0x79, - 0xf9, 0x6c, 0x3d, 0x0f, 0x65, 0x19, 0x72, 0x82, 0xa0, 0x5d, 0x22, 0x65, 0xf9, 0x9b, 0x80, 0x3d, - 0x16, 0x50, 0x2d, 0x85, 0x57, 0xc6, 0xcc, 0xeb, 0xf4, 0xe9, 0xba, 0xa1, 0xa5, 0x79, 0xdc, 0x36, - 0x98, 0x13, 0x78, 0xd6, 0xa1, 0x96, 0xe1, 0x27, 0x94, 0xfb, 0x2c, 0xd8, 0x1c, 0xb5, 0xb5, 0xec, - 0xda, 0xef, 0x33, 0xa0, 0xf2, 0xb2, 0xb9, 0x4d, 0xbd, 0x7d, 0xd6, 0xa1, 0xe4, 0x7b, 0xe2, 0xa7, - 0x23, 0x44, 0xce, 0x86, 0xff, 0xbf, 0x12, 0x3e, 0xad, 0x2e, 0x24, 0x68, 0xf2, 0xc7, 0x24, 0xe5, - 0x2f, 0xfe, 0xfc, 0xf7, 0x9f, 0xa5, 0x0b, 0x24, 0xb7, 0x3a, 0xe4, 0x7a, 0xf7, 0xc2, 0x9f, 0x6d, - 0x10, 0x59, 0x1d, 0xc4, 0x28, 0xb2, 0x71, 0x65, 0x86, 0x2a, 0xad, 0xcc, 0xa1, 0x15, 0x85, 0x14, - 0x56, 0x7d, 0xa1, 0xbd, 0x1d, 0xfb, 0x85, 0x03, 0x79, 0x21, 0x16, 0x1d, 0x9c, 0x10, 0x59, 0xd3, - 0x8f, 0x32, 0xa4, 0xc1, 0x05, 0x34, 0x58, 0x26, 0xea, 0x2a, 0x06, 0xd3, 0x32, 0xc7, 0x00, 0x32, - 0x3c, 0xfa, 0x74, 0x4c, 0x6e, 0xce, 0x98, 0x90, 0xf4, 0xc8, 0x45, 0xf5, 0x44, 0xbe, 0xf4, 0x74, - 0x0d, 0x3d, 0x5d, 0x21, 0x0b, 0x31, 0x4f, 0xcb, 0xbb, 0xd2, 0x7a, 0x6f, 0xf6, 0x97, 0x36, 0xe4, - 0xba, 0x44, 0xd7, 0x04, 0x35, 0xf2, 0x76, 0xe3, 0x04, 0xae, 0xf4, 0xf5, 0x22, 0xfa, 0x5a, 0x20, - 0xf3, 0xab, 0x36, 0xdd, 0x5f, 0xb6, 0x47, 0x83, 0xe1, 0xb2, 0x2b, 0x64, 0x1a, 0xdf, 0xf9, 0x6a, - 0x72, 0x33, 0xf5, 0xf5, 0xe4, 0x66, 0xea, 0x6f, 0x93, 0x9b, 0xa9, 0x2f, 0xbf, 0xb9, 0x79, 0xe9, - 0xeb, 0x6f, 0x6e, 0x5e, 0xfa, 0xcb, 0x37, 0x37, 0x2f, 0xfd, 0xe8, 0x46, 0x9b, 0x7a, 0xc1, 0xe1, - 0x4a, 0x40, 0x3b, 0xbd, 0x55, 0x6e, 0x7d, 0xb5, 0xeb, 0xae, 0x0e, 0xf7, 0xba, 0xab, 0xe2, 0x67, - 0x4a, 0xed, 0x3c, 0x62, 0xc5, 0xdb, 0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x06, 0x63, 0xba, 0x90, - 0xb7, 0x24, 0x00, 0x00, + 0x83, 0x4f, 0x41, 0x57, 0xf7, 0x0c, 0x67, 0xa8, 0xf7, 0x06, 0xb9, 0x2c, 0x72, 0x11, 0xd4, 0xd5, + 0x55, 0xd5, 0x8f, 0xf9, 0xd5, 0xaf, 0xaa, 0xbb, 0x09, 0xa5, 0x43, 0xb7, 0xef, 0x0e, 0xdb, 0x2b, + 0x43, 0xcf, 0x0d, 0x5c, 0x92, 0xe5, 0xad, 0xc5, 0x1b, 0x5d, 0xd7, 0xed, 0xf6, 0xe9, 0xaa, 0x35, + 0x64, 0xab, 0x96, 0xe3, 0xb8, 0x81, 0x15, 0x30, 0xd7, 0xf1, 0x85, 0xce, 0xe2, 0x72, 0x97, 0x05, + 0xbd, 0x51, 0x7b, 0xa5, 0xe3, 0x0e, 0x56, 0xbb, 0x6e, 0xd7, 0x5d, 0x45, 0x71, 0x7b, 0xb4, 0x8b, + 0x2d, 0x6c, 0xe0, 0x7f, 0x52, 0xbd, 0x2a, 0x9d, 0x45, 0x5a, 0x01, 0x1b, 0x50, 0x3f, 0xb0, 0x06, + 0x43, 0xa1, 0x50, 0xbb, 0x09, 0xd9, 0x2d, 0xe6, 0x74, 0x17, 0x15, 0x28, 0x98, 0xf4, 0xf3, 0x11, + 0xf5, 0x83, 0x45, 0x80, 0xa2, 0x49, 0xfd, 0xa1, 0xeb, 0xf8, 0xb4, 0xf6, 0x8b, 0x14, 0x54, 0x9a, + 0x74, 0xbf, 0x39, 0x1a, 0x0c, 0x9f, 0xb4, 0x3f, 0xa3, 0x9d, 0xc0, 0x5f, 0x5c, 0x8b, 0x34, 0xc9, + 0xeb, 0x30, 0x77, 0xc0, 0x82, 0x5e, 0x6b, 0xe8, 0xd1, 0xbe, 0x6b, 0xd9, 0xcc, 0xe9, 0xea, 0xa9, + 0xa5, 0xd4, 0xed, 0xa2, 0x59, 0xe1, 0xe2, 0xad, 0x48, 0xba, 0xf8, 0xe3, 0xa9, 0x4b, 0xf2, 0x32, + 0xe4, 0xda, 0x56, 0xd0, 0xe9, 0xa1, 0xaa, 0xba, 0xa6, 0xae, 0xf0, 0x55, 0xaf, 0x34, 0xb8, 0xc8, + 0x14, 0x3d, 0xe4, 0x2e, 0x28, 0xb6, 0x7b, 0xe0, 0x70, 0x6b, 0x5f, 0x4f, 0x2f, 0x65, 0x6e, 0xab, + 0x6b, 0x15, 0xa1, 0xd6, 0x94, 0x62, 0x73, 0xaa, 0x50, 0xfb, 0x79, 0x1a, 0xf2, 0xdb, 0x81, 0x15, + 0x8c, 0xfc, 0xf8, 0x2a, 0x7e, 0x9a, 0x8e, 0x8d, 0x79, 0x15, 0xf2, 0xa3, 0x21, 0x5f, 0x3a, 0x0e, + 0x9a, 0x33, 0x65, 0x8b, 0x5c, 0x81, 0xbc, 0xdd, 0x6e, 0x51, 0xcf, 0xd3, 0xd3, 0x4b, 0xa9, 0xdb, + 0x8a, 0x99, 0xb3, 0xdb, 0x1b, 0x9e, 0x47, 0xaa, 0xa0, 0x3a, 0xed, 0x16, 0x75, 0x02, 0x16, 0x30, + 0xea, 0xeb, 0x80, 0x36, 0xe0, 0xb4, 0x37, 0xa4, 0x44, 0x2a, 0x0c, 0x3d, 0x17, 0xb7, 0x44, 0x57, + 0x43, 0x85, 0x2d, 0x29, 0x21, 0x37, 0x01, 0x9c, 0x76, 0xab, 0xe3, 0x0e, 0x06, 0x2c, 0xf0, 0xf5, + 0x12, 0xf6, 0x2b, 0x4e, 0x7b, 0x5d, 0x08, 0xa4, 0xbd, 0x47, 0xfb, 0xd4, 0xf2, 0xa9, 0xaf, 0x97, + 0x43, 0x7b, 0x53, 0x4a, 0xc8, 0x75, 0x50, 0x9c, 0x76, 0xab, 0x3d, 0x62, 0x7d, 0xdb, 0xd7, 0x2b, + 0xd8, 0x5d, 0x74, 0xda, 0x0d, 0x6c, 0x93, 0x3b, 0x30, 0xef, 0xb4, 0x5b, 0x03, 0xea, 0x75, 0x69, + 0xcb, 0x13, 0xcb, 0xf5, 0xf5, 0x39, 0x54, 0x9a, 0x73, 0xda, 0x8f, 0xb8, 0x5c, 0xee, 0x82, 0x5f, + 0xfb, 0x2e, 0x07, 0x0a, 0x9a, 0x3d, 0x64, 0x7e, 0xb0, 0xf8, 0x9b, 0xdc, 0xf4, 0xe3, 0x5d, 0x86, + 0x5c, 0x9f, 0x0d, 0x58, 0x20, 0xb7, 0x44, 0x34, 0xc8, 0x3d, 0xa8, 0x58, 0x5e, 0xc0, 0x76, 0xad, + 0x4e, 0xd0, 0xda, 0x63, 0x8e, 0xdc, 0xff, 0xca, 0xda, 0x82, 0xd8, 0xff, 0xba, 0xec, 0x5b, 0xf9, + 0x88, 0x39, 0xb6, 0x59, 0x0e, 0x55, 0x79, 0xcb, 0x27, 0xaf, 0x02, 0x7e, 0xf7, 0x56, 0x28, 0xf5, + 0xf5, 0x0c, 0xa2, 0xa1, 0xcc, 0xa5, 0xa1, 0xa5, 0x4f, 0x5e, 0x83, 0x22, 0x2e, 0xac, 0xc5, 0x6c, + 0x3d, 0xbb, 0x94, 0xb9, 0xad, 0x34, 0xd4, 0xc9, 0xb8, 0x5a, 0xc0, 0x59, 0x1a, 0x4d, 0xb3, 0x80, + 0x9d, 0x86, 0x4d, 0xee, 0x02, 0xc8, 0x1d, 0xe6, 0x9a, 0x39, 0xd4, 0x2c, 0x4f, 0xc6, 0x55, 0x45, + 0xee, 0xb2, 0xd1, 0x34, 0x15, 0xa9, 0x60, 0xd8, 0x64, 0x15, 0xd4, 0x68, 0xe2, 0xcc, 0xd6, 0xf3, + 0xa8, 0x5e, 0x99, 0x8c, 0xab, 0x10, 0x8e, 0x6c, 0x34, 0x4d, 0x08, 0x55, 0xd0, 0xa0, 0x24, 0xa6, + 0x61, 0x7b, 0x6c, 0x9f, 0x7a, 0x7a, 0x01, 0xd7, 0x59, 0x92, 0x38, 0x43, 0x99, 0xa9, 0xa2, 0x86, + 0x68, 0x90, 0x35, 0x10, 0xcd, 0x96, 0x1f, 0x58, 0x01, 0xd5, 0x8b, 0xa8, 0x3f, 0x2f, 0xe1, 0xcb, + 0x3b, 0x56, 0x38, 0x0a, 0xa9, 0x09, 0xa8, 0x85, 0xff, 0x93, 0x0f, 0x60, 0x0e, 0xbf, 0x93, 0xfc, + 0x4c, 0x7c, 0x66, 0x0a, 0xce, 0x8c, 0x4c, 0xc6, 0xd5, 0x4a, 0xfc, 0x53, 0x19, 0x4d, 0xb3, 0x12, + 0x57, 0x35, 0x6c, 0xf2, 0x18, 0xae, 0x26, 0x8c, 0xad, 0x51, 0xd0, 0x73, 0x3d, 0xee, 0x03, 0xd0, + 0x87, 0x3e, 0x19, 0x57, 0x2f, 0xc7, 0x7d, 0xd4, 0x51, 0xc1, 0x68, 0x9a, 0x97, 0xe3, 0x76, 0x52, + 0x6a, 0x93, 0x37, 0x61, 0x1e, 0xbf, 0x4f, 0xbc, 0x13, 0xb1, 0x5b, 0x34, 0x35, 0xde, 0xf1, 0x28, + 0x26, 0x27, 0x0f, 0x80, 0x24, 0x06, 0x17, 0x8b, 0x2e, 0xe1, 0xa2, 0x75, 0xb1, 0xe8, 0xf8, 0xd0, + 0x72, 0xed, 0xf3, 0x71, 0x1b, 0xb1, 0x05, 0x57, 0x21, 0xdf, 0xf6, 0x2c, 0xa7, 0xd3, 0xd3, 0xcb, + 0x7c, 0xd6, 0xa6, 0x6c, 0x91, 0xb7, 0xe0, 0x32, 0xce, 0xc6, 0x71, 0x93, 0x13, 0xaa, 0xe0, 0x84, + 0x08, 0xef, 0x7b, 0xec, 0xc6, 0xa7, 0xb4, 0xb8, 0x1a, 0x8b, 0xe8, 0x57, 0x20, 0x2f, 0xa3, 0x23, + 0x85, 0xfc, 0xa0, 0xc6, 0xbe, 0x83, 0x29, 0xbb, 0x6a, 0x3f, 0x01, 0x2d, 0xc2, 0xfe, 0x7d, 0xd6, + 0x0f, 0xa8, 0x97, 0xa0, 0x88, 0x56, 0xcc, 0xdf, 0x6d, 0x28, 0x46, 0xf1, 0x2e, 0x3c, 0x4a, 0x24, + 0x60, 0xcc, 0x1f, 0x9a, 0x51, 0x2f, 0x79, 0x03, 0x8a, 0x51, 0xe0, 0x0b, 0x6e, 0x2a, 0x0b, 0x4d, + 0x09, 0x4b, 0x33, 0xea, 0xae, 0x8d, 0x53, 0xa0, 0x3d, 0xa2, 0x81, 0x65, 0x5b, 0x81, 0xf5, 0x64, + 0x9f, 0x7a, 0x1e, 0xb3, 0xe3, 0xfb, 0xa1, 0x22, 0xe7, 0x84, 0xfb, 0xf1, 0x0e, 0x94, 0x7b, 0x96, + 0x2f, 0x39, 0x83, 0x7f, 0xe4, 0x2e, 0xef, 0x6e, 0xcc, 0x4d, 0xc6, 0x55, 0x75, 0xd3, 0xf2, 0x05, + 0x75, 0x18, 0x4d, 0x53, 0xed, 0x45, 0x0d, 0x9b, 0xbc, 0x07, 0x15, 0x6e, 0x14, 0x8b, 0x13, 0x86, + 0x56, 0xda, 0x64, 0x5c, 0x2d, 0x6d, 0x5a, 0xfe, 0x34, 0x54, 0x4a, 0xbd, 0x69, 0xcb, 0x26, 0x1b, + 0xb0, 0xc0, 0xed, 0x66, 0xb1, 0xb9, 0x87, 0xc6, 0x57, 0x26, 0xe3, 0xea, 0xfc, 0xa6, 0xe5, 0xcf, + 0xc0, 0x73, 0xbe, 0x27, 0x45, 0x11, 0x42, 0x6b, 0xbf, 0x2a, 0x43, 0x0e, 0x77, 0x98, 0xdc, 0x85, + 0x34, 0xb3, 0x91, 0x4a, 0x94, 0xc6, 0x8d, 0xc9, 0xb8, 0x9a, 0x36, 0x9a, 0xcf, 0xc6, 0x55, 0xd2, + 0x75, 0xbd, 0xc1, 0xbd, 0xda, 0xd0, 0x63, 0x03, 0xcb, 0x3b, 0x6c, 0xed, 0xd1, 0xc3, 0x9a, 0x99, + 0x66, 0x36, 0x79, 0x05, 0x0a, 0x7c, 0xcb, 0xf8, 0x90, 0x48, 0xbc, 0x0d, 0x98, 0x8c, 0xab, 0xf9, + 0x4f, 0xdd, 0xbe, 0x6b, 0x34, 0xcd, 0x3c, 0xef, 0x32, 0x6c, 0xb2, 0x0e, 0xd0, 0xf1, 0xa8, 0x15, + 0x50, 0xbb, 0x65, 0x05, 0x48, 0x25, 0xea, 0xda, 0xe2, 0x8a, 0x48, 0x68, 0x2b, 0x61, 0x42, 0x5b, + 0xd9, 0x09, 0x13, 0x5a, 0xa3, 0xf8, 0xf5, 0xb8, 0x9a, 0xfa, 0xea, 0x2f, 0xd5, 0x94, 0xa9, 0x48, + 0xbb, 0x7a, 0xc0, 0x9d, 0x8c, 0x86, 0x76, 0xe8, 0x24, 0x7b, 0x11, 0x27, 0xd2, 0xae, 0xce, 0xf3, + 0x5c, 0x4e, 0xc0, 0x3f, 0xb7, 0x94, 0x3a, 0x3e, 0xe6, 0x45, 0x3f, 0x79, 0x00, 0xa5, 0x8e, 0x3b, + 0x18, 0xf6, 0xa9, 0x1c, 0x2f, 0x7f, 0x81, 0xf1, 0xd4, 0xc8, 0xb2, 0x1e, 0x10, 0x1d, 0x0a, 0x03, + 0xea, 0xfb, 0x56, 0x97, 0xea, 0x05, 0x44, 0x49, 0xd8, 0xe4, 0x0b, 0xf2, 0x03, 0xcb, 0x93, 0x03, + 0x14, 0x2f, 0xb2, 0x20, 0x69, 0x57, 0x0f, 0xc8, 0x06, 0xa8, 0xbb, 0xcc, 0x61, 0x7e, 0x4f, 0x78, + 0x51, 0x2e, 0xe0, 0x05, 0x42, 0xc3, 0x7a, 0xc0, 0x19, 0x5a, 0xc2, 0x75, 0xe4, 0xf5, 0x31, 0x4d, + 0x4a, 0x86, 0x16, 0xf8, 0x7c, 0x6a, 0x3e, 0x34, 0x15, 0xa1, 0xf0, 0xd4, 0xeb, 0x9f, 0x08, 0xfc, + 0xff, 0x81, 0xbc, 0xa4, 0xe0, 0x12, 0x6e, 0x6f, 0x92, 0x82, 0x65, 0x1f, 0xcf, 0x1a, 0x7e, 0xcf, + 0xf5, 0x10, 0xa6, 0x65, 0x1c, 0x09, 0xb3, 0xc6, 0x36, 0x97, 0xf1, 0xac, 0x81, 0x9d, 0x06, 0x42, + 0x6b, 0xbf, 0xe3, 0xb7, 0x02, 0xab, 0x8b, 0x4c, 0x22, 0xa1, 0xf5, 0xf1, 0xfa, 0xf6, 0x8e, 0xd5, + 0x35, 0xf3, 0xfb, 0x1d, 0x7f, 0xc7, 0xea, 0x92, 0x65, 0x50, 0xa5, 0x12, 0xce, 0x7c, 0x6e, 0x3a, + 0x73, 0xa1, 0x88, 0x33, 0x17, 0xba, 0x7c, 0xe6, 0x37, 0x01, 0x3c, 0xeb, 0xa0, 0x25, 0x67, 0x7f, + 0x05, 0x67, 0xaf, 0x78, 0xd6, 0x41, 0x43, 0x2c, 0x60, 0x4d, 0x04, 0x21, 0x57, 0x11, 0xab, 0xd5, + 0xaf, 0xe2, 0x86, 0xca, 0x85, 0x88, 0xcd, 0xc0, 0x00, 0x34, 0xad, 0x03, 0xd1, 0x22, 0xef, 0xc2, + 0x5c, 0x68, 0x23, 0x83, 0x57, 0xbf, 0x86, 0x46, 0x33, 0x64, 0x52, 0x16, 0x56, 0xb2, 0x49, 0x9a, + 0x70, 0x39, 0x34, 0x4b, 0x90, 0xa6, 0x8e, 0xb6, 0xe4, 0x28, 0x2f, 0x9b, 0x44, 0x38, 0x48, 0x70, + 0xfb, 0x87, 0x30, 0x9f, 0x9c, 0x30, 0xdf, 0xd4, 0x97, 0x70, 0x13, 0x30, 0x2f, 0x6d, 0xc6, 0x66, + 0xca, 0xf3, 0x52, 0x7c, 0xe6, 0x86, 0x4d, 0x7e, 0x00, 0x64, 0x66, 0xee, 0xdc, 0x7e, 0x11, 0xed, + 0x17, 0x26, 0xe3, 0xea, 0xdc, 0x66, 0x7c, 0xce, 0x46, 0xd3, 0x9c, 0x4b, 0x2c, 0xc2, 0xb0, 0xc9, + 0x13, 0xb8, 0x76, 0xdc, 0x32, 0xb8, 0x9b, 0xeb, 0xe8, 0x06, 0x53, 0xdb, 0xe6, 0x91, 0x99, 0xf3, + 0xd4, 0x76, 0x74, 0x3d, 0x86, 0x4d, 0x9e, 0x0a, 0xf2, 0x9c, 0x56, 0x1e, 0x34, 0x5e, 0x35, 0x86, + 0x15, 0x40, 0x63, 0xe9, 0xd9, 0xb8, 0x7a, 0x43, 0x70, 0xd2, 0xae, 0xeb, 0x51, 0xd6, 0x75, 0xf6, + 0xe8, 0xe1, 0xbd, 0x4d, 0xcb, 0x97, 0xc5, 0x47, 0x0d, 0xbf, 0xd2, 0xb4, 0x54, 0x79, 0x13, 0x60, + 0xca, 0xc9, 0xfa, 0xee, 0x31, 0x5f, 0x55, 0x89, 0xd8, 0xf8, 0xf9, 0x08, 0x7c, 0x05, 0xd4, 0x18, + 0x81, 0xeb, 0xbd, 0xe3, 0x30, 0x00, 0x53, 0xea, 0x7e, 0x6e, 0xc2, 0xff, 0x10, 0xb4, 0x59, 0xc2, + 0xd7, 0x3f, 0x3b, 0x11, 0x34, 0x73, 0x33, 0x54, 0x7f, 0x81, 0x7c, 0xe1, 0x9d, 0x96, 0x2f, 0xbe, + 0x4c, 0x41, 0x4e, 0x54, 0x05, 0x1a, 0x94, 0x9e, 0x3a, 0x7b, 0x8e, 0x7b, 0xe0, 0x60, 0x5b, 0xbb, + 0x44, 0x54, 0x28, 0x98, 0x23, 0xc7, 0x61, 0x4e, 0x57, 0x4b, 0x11, 0x80, 0xfc, 0x7d, 0x8b, 0xf5, + 0xa9, 0xad, 0xa5, 0xf9, 0xff, 0x5b, 0x96, 0xef, 0x53, 0x5b, 0xcb, 0x90, 0x12, 0x14, 0xd7, 0x2d, + 0xa7, 0x43, 0x79, 0x4f, 0x96, 0x94, 0x41, 0xd9, 0xee, 0xf4, 0xa8, 0x3d, 0xe2, 0xcd, 0x1c, 0xf7, + 0xb0, 0xbd, 0xc7, 0x86, 0x43, 0x6a, 0x6b, 0x79, 0x6e, 0xf5, 0xd8, 0x0d, 0xcc, 0x91, 0xa3, 0x15, + 0xb8, 0x15, 0xa7, 0x32, 0xdb, 0x1d, 0x05, 0x5a, 0xb1, 0xf6, 0xc7, 0x2c, 0x2f, 0x01, 0xb0, 0xd0, + 0x7e, 0xb1, 0xd3, 0x56, 0x2c, 0x89, 0xe4, 0x92, 0x49, 0x64, 0x4a, 0xb9, 0xf9, 0x53, 0x28, 0x37, + 0x49, 0xef, 0x85, 0x33, 0xe8, 0x3d, 0x4e, 0xd0, 0xc5, 0x53, 0x08, 0xfa, 0x9d, 0x73, 0x85, 0xea, + 0xbf, 0x13, 0x88, 0x33, 0x31, 0xd5, 0x3d, 0x2b, 0xa6, 0x8e, 0x8b, 0x8d, 0xde, 0xb9, 0x63, 0xa3, + 0xf6, 0xeb, 0x2c, 0xe4, 0xe5, 0xc8, 0xff, 0x85, 0xd3, 0x29, 0x70, 0x9a, 0xe6, 0xff, 0x42, 0x22, + 0xff, 0xbf, 0x05, 0x25, 0x4c, 0x06, 0xe1, 0x69, 0x98, 0xc6, 0x8b, 0x6a, 0x19, 0xa8, 0x48, 0x9a, + 0xd1, 0xe9, 0xf8, 0x8e, 0x40, 0x83, 0x3c, 0x00, 0xec, 0x1e, 0x3d, 0x00, 0x70, 0x30, 0xc8, 0xc3, + 0xf2, 0x45, 0xc1, 0x20, 0x91, 0x26, 0xce, 0x5a, 0x12, 0x06, 0xc9, 0xa3, 0x00, 0x77, 0x2e, 0xce, + 0x54, 0xc7, 0x22, 0x87, 0x9d, 0x1f, 0x39, 0x7f, 0x57, 0xa0, 0x14, 0xd7, 0x78, 0xb1, 0xf1, 0x53, + 0x07, 0x05, 0x37, 0x0a, 0x7d, 0xe4, 0x2e, 0xe0, 0xa3, 0x28, 0xcc, 0xea, 0x78, 0x67, 0x11, 0xb0, + 0xa0, 0x4f, 0x11, 0x67, 0x8a, 0x29, 0x1a, 0xa7, 0x14, 0xcb, 0x53, 0x60, 0x16, 0xcf, 0x05, 0x4c, + 0x25, 0x01, 0xcc, 0x95, 0xb0, 0xec, 0x07, 0x34, 0x3e, 0xf9, 0xd4, 0x2b, 0xab, 0xff, 0x24, 0x5f, + 0xaa, 0x67, 0xf0, 0xe5, 0x5d, 0x00, 0x31, 0x0e, 0x6a, 0x97, 0xa6, 0xda, 0xa2, 0xaa, 0x44, 0x6d, + 0xa1, 0x30, 0xcb, 0xae, 0xa7, 0x95, 0xbf, 0x4b, 0x90, 0x67, 0x7e, 0xeb, 0x80, 0x0d, 0xc5, 0x39, + 0xba, 0xa1, 0x4c, 0xc6, 0xd5, 0x9c, 0xe1, 0x7f, 0x62, 0x6c, 0x99, 0x39, 0xe6, 0x7f, 0xc2, 0x86, + 0xff, 0xe1, 0x70, 0xdb, 0x91, 0xec, 0xee, 0xfb, 0xac, 0xeb, 0x50, 0xea, 0xeb, 0xdd, 0xa3, 0x87, + 0xe9, 0xc6, 0xcb, 0xcf, 0xc6, 0xd5, 0x9b, 0x02, 0xd4, 0x03, 0xcb, 0x39, 0x5c, 0xe3, 0x7f, 0xee, + 0x0d, 0xbc, 0xa9, 0x95, 0xac, 0xc3, 0xc2, 0x66, 0xe8, 0xd5, 0xa3, 0xfb, 0x8c, 0x1e, 0x50, 0xcf, + 0xd7, 0x7b, 0x17, 0xf0, 0x1a, 0x59, 0x09, 0xaf, 0x66, 0xd8, 0x9c, 0xa5, 0x06, 0x76, 0xf1, 0xda, + 0xeb, 0xb3, 0x73, 0xd5, 0x5e, 0x49, 0x4a, 0xd9, 0x3b, 0x9d, 0x52, 0xc2, 0xf4, 0x18, 0xdd, 0xf5, + 0xf4, 0x13, 0x55, 0x64, 0x74, 0xc5, 0xa3, 0x46, 0x26, 0xd3, 0x11, 0x64, 0x7a, 0x1c, 0x5c, 0xb0, + 0x4e, 0x75, 0xce, 0xae, 0x53, 0x6b, 0x1f, 0x9e, 0x5c, 0xb8, 0x01, 0xe4, 0x9f, 0x0c, 0xa9, 0x43, + 0x6d, 0x51, 0xb7, 0xad, 0xf7, 0x5d, 0x3f, 0xac, 0xdb, 0x30, 0x56, 0x6c, 0x2d, 0x53, 0xfb, 0x65, + 0x0e, 0x0a, 0xe1, 0x36, 0xbe, 0xd0, 0x24, 0x37, 0x65, 0x9c, 0xdc, 0x29, 0x8c, 0x43, 0x20, 0xeb, + 0x58, 0x83, 0x90, 0xc6, 0xf0, 0x7f, 0xb2, 0x04, 0xaa, 0x4d, 0xfd, 0x8e, 0xc7, 0x86, 0x01, 0x73, + 0x1d, 0xc9, 0x64, 0x71, 0xd1, 0xf3, 0x55, 0x4e, 0x17, 0x09, 0xde, 0x65, 0x11, 0x10, 0xe1, 0xb5, + 0x75, 0x22, 0x74, 0x25, 0x8e, 0x20, 0x02, 0x85, 0x7f, 0x84, 0x49, 0x7a, 0x67, 0x32, 0xc9, 0xf7, + 0xc5, 0xc1, 0x33, 0x9e, 0x2f, 0x7d, 0x9d, 0xa1, 0xd9, 0x71, 0x09, 0x53, 0x9b, 0x49, 0x98, 0x3e, + 0x79, 0x03, 0xf8, 0x74, 0x5b, 0xee, 0x81, 0x43, 0x3d, 0x79, 0x7e, 0x99, 0xb9, 0xa7, 0xeb, 0x59, + 0xfe, 0x13, 0xde, 0x1b, 0xce, 0x0e, 0x55, 0xa7, 0x67, 0x15, 0xbc, 0x11, 0xde, 0x94, 0x3a, 0x46, + 0x13, 0xd7, 0x23, 0xfe, 0xb7, 0x6b, 0xff, 0xcc, 0x42, 0x5e, 0xb8, 0x79, 0xb1, 0x31, 0x1a, 0xa2, + 0x2f, 0x17, 0x43, 0xdf, 0xb9, 0x4f, 0x04, 0xd6, 0xbe, 0x15, 0x58, 0xde, 0xec, 0x89, 0xa0, 0x8e, + 0x52, 0xcc, 0x59, 0x42, 0x81, 0xe7, 0xac, 0x57, 0x21, 0xbb, 0xc7, 0x1c, 0x5b, 0xe6, 0xde, 0xf9, + 0xf8, 0x77, 0x12, 0xef, 0x07, 0xd8, 0x3d, 0x0b, 0x7c, 0xe5, 0x28, 0xf0, 0xe5, 0xa7, 0x8c, 0xae, + 0x5d, 0xe9, 0x71, 0xd7, 0xae, 0xea, 0x94, 0x73, 0x8f, 0x20, 0x79, 0xf7, 0x0c, 0x24, 0x1f, 0x8b, + 0xcb, 0xee, 0xf9, 0x71, 0x59, 0xfb, 0x7f, 0xc8, 0xf2, 0x15, 0x91, 0x39, 0x50, 0x25, 0x3b, 0xf2, + 0xa6, 0x76, 0x89, 0x14, 0x21, 0xfb, 0xd4, 0xa7, 0x9e, 0x96, 0xe2, 0xc4, 0xf9, 0xc4, 0xeb, 0x5a, + 0x0e, 0xfb, 0x02, 0x1f, 0xf4, 0xb4, 0x34, 0x29, 0x40, 0xa6, 0xe1, 0x06, 0x5a, 0xa6, 0xf6, 0x0f, + 0x05, 0x8a, 0x61, 0xc4, 0xbe, 0xd8, 0xd0, 0xbb, 0x0e, 0xca, 0x2e, 0xeb, 0xd3, 0x96, 0xcf, 0xbe, + 0x10, 0xf8, 0xcb, 0x98, 0x45, 0x2e, 0xd8, 0x66, 0x5f, 0x50, 0x72, 0x13, 0xa0, 0xef, 0x76, 0xac, + 0x7e, 0x6b, 0x68, 0x05, 0x3d, 0xc9, 0x8d, 0x0a, 0x4a, 0xb6, 0xac, 0xa0, 0x47, 0xd6, 0xa0, 0x14, + 0x3e, 0xfa, 0xc5, 0xe0, 0x87, 0x69, 0x2b, 0x7c, 0x16, 0xe4, 0x00, 0x54, 0x43, 0x25, 0x0e, 0xc1, + 0xeb, 0xa0, 0x0c, 0xd8, 0x80, 0xb6, 0x82, 0xc3, 0x21, 0x15, 0xa7, 0x52, 0xb3, 0xc8, 0x05, 0x3b, + 0x87, 0x43, 0x4a, 0x5e, 0xe2, 0x35, 0x95, 0xf5, 0x76, 0xcb, 0x1f, 0x0d, 0x24, 0xea, 0x0a, 0xbc, + 0xbd, 0x3d, 0x1a, 0xf0, 0xa9, 0xf8, 0x3d, 0x6b, 0xed, 0xdd, 0xf7, 0xb0, 0x13, 0xc4, 0x54, 0x84, + 0x84, 0x77, 0xdf, 0x09, 0x2b, 0x43, 0x15, 0xa1, 0x7d, 0x79, 0xe6, 0x71, 0x2c, 0x51, 0x15, 0xbe, + 0x2e, 0xa3, 0x40, 0x5c, 0x6e, 0x1e, 0xfb, 0x8e, 0x26, 0xe2, 0x60, 0x1a, 0x82, 0xe5, 0x53, 0x42, + 0xb0, 0x0a, 0x6a, 0x7b, 0xe4, 0xd8, 0x7d, 0xda, 0xc2, 0x18, 0xc6, 0x3b, 0x4e, 0x13, 0x84, 0xe8, + 0x31, 0x8f, 0xe4, 0x57, 0xa1, 0x22, 0x15, 0xf6, 0xa9, 0xe7, 0xf3, 0x88, 0xc2, 0xeb, 0x4d, 0xb3, + 0x2c, 0xa4, 0x1f, 0x0b, 0x21, 0x67, 0x52, 0xa9, 0xc6, 0x6c, 0x5d, 0xc3, 0xad, 0x2c, 0x4d, 0xc6, + 0xd5, 0x62, 0x03, 0x85, 0x46, 0xd3, 0x2c, 0x8a, 0x6e, 0xc3, 0x8e, 0x0d, 0xc9, 0x3a, 0xae, 0xa3, + 0xcf, 0xc7, 0x87, 0x34, 0x3a, 0xae, 0x43, 0x6e, 0x0b, 0x56, 0xc6, 0x1c, 0xa3, 0xd3, 0xc4, 0xb3, + 0x2e, 0xa6, 0x98, 0x62, 0x98, 0x62, 0xc2, 0x48, 0x8e, 0xde, 0xff, 0x76, 0x13, 0xa4, 0x1c, 0x3e, + 0x01, 0x42, 0xa8, 0x3f, 0xbd, 0x20, 0x93, 0x49, 0x26, 0x79, 0x7e, 0x0b, 0x73, 0x0c, 0x4c, 0x73, + 0x4c, 0x58, 0xa4, 0x49, 0x7d, 0x3e, 0x46, 0x2f, 0x51, 0xa4, 0x49, 0x3d, 0x59, 0xa4, 0x85, 0x2d, + 0x3b, 0xf9, 0xe6, 0xcc, 0xce, 0x78, 0x73, 0x26, 0xff, 0x0b, 0x73, 0x51, 0xa3, 0xd5, 0x71, 0x47, + 0x8e, 0xb8, 0x4d, 0xcb, 0x34, 0xd4, 0x67, 0xe3, 0x6a, 0xc1, 0xff, 0xbc, 0x7f, 0xaf, 0xb6, 0x5c, + 0x33, 0x2b, 0x91, 0xce, 0x3a, 0x57, 0x21, 0x8f, 0xe0, 0xaa, 0xdd, 0x8f, 0xf2, 0x77, 0x0b, 0xab, + 0x5b, 0x81, 0xe5, 0xdf, 0x8b, 0x78, 0xbf, 0x36, 0x19, 0x57, 0x17, 0x9a, 0x0f, 0x43, 0x74, 0x6c, + 0xa3, 0x02, 0x07, 0xf5, 0x82, 0xdd, 0x9f, 0x11, 0x7a, 0x7d, 0x7e, 0xfa, 0x1c, 0xf6, 0x99, 0x9f, + 0x70, 0xf4, 0x87, 0xd4, 0xf4, 0x1a, 0x77, 0xeb, 0x21, 0xf3, 0x63, 0x3e, 0x2a, 0xa8, 0x1c, 0x99, + 0xd7, 0x36, 0x4f, 0x2e, 0xe9, 0x4a, 0x50, 0xbc, 0x2f, 0xaf, 0xf9, 0xb5, 0x14, 0xe7, 0xa9, 0xc7, + 0xf4, 0x40, 0x4b, 0x13, 0x05, 0x72, 0x1b, 0x9e, 0xe7, 0x7a, 0x5a, 0x86, 0xa8, 0x50, 0x68, 0x52, + 0x7c, 0xad, 0xd0, 0xb2, 0xb5, 0xb5, 0x93, 0xd8, 0xaf, 0x00, 0x19, 0x63, 0xab, 0x2e, 0x5c, 0xd4, + 0xb7, 0x3e, 0x12, 0x9c, 0xd7, 0x7c, 0xf4, 0x40, 0xcb, 0xd4, 0xbe, 0x4b, 0x41, 0x31, 0xdc, 0x59, + 0xf2, 0x41, 0xc4, 0x79, 0x99, 0xc6, 0x9b, 0x11, 0xe7, 0xbd, 0x2c, 0x38, 0x6f, 0xcb, 0x34, 0x1e, + 0xd5, 0xcd, 0x4f, 0x5b, 0x1f, 0x6d, 0x7c, 0xfa, 0x41, 0xfd, 0xe9, 0xce, 0x93, 0x96, 0xf1, 0x78, + 0xdd, 0xdc, 0x78, 0xb4, 0xf1, 0x78, 0x47, 0x50, 0x60, 0x92, 0xdd, 0xd2, 0xcf, 0xc7, 0x6e, 0x6f, + 0x0b, 0x60, 0x86, 0xdf, 0x46, 0xa2, 0x78, 0xb6, 0xb4, 0x52, 0x63, 0xa5, 0x15, 0x79, 0x5f, 0x5c, + 0xe1, 0xc7, 0x5f, 0x9d, 0x05, 0x9c, 0xe7, 0x27, 0xe3, 0x6a, 0x79, 0x73, 0xaa, 0x69, 0x34, 0xf1, + 0x1a, 0x3f, 0x6a, 0xda, 0xb5, 0xdf, 0xa6, 0x21, 0x87, 0xbf, 0x78, 0x38, 0xd7, 0x3b, 0x26, 0xc7, + 0xe6, 0xb4, 0xe8, 0x4b, 0x1f, 0x5b, 0xf4, 0x4d, 0x15, 0x12, 0x0f, 0x94, 0x99, 0x53, 0x1f, 0x28, + 0x13, 0xaf, 0x9e, 0xd9, 0xb3, 0x5e, 0x3d, 0xa3, 0x3a, 0x2f, 0x77, 0x5c, 0x9d, 0x17, 0x75, 0x93, + 0xd7, 0xa0, 0x10, 0xe6, 0xdd, 0xfc, 0x31, 0x79, 0x37, 0xec, 0x24, 0xef, 0x43, 0x65, 0xe6, 0x37, + 0x0c, 0x85, 0x13, 0x33, 0x6e, 0x79, 0x10, 0xff, 0x55, 0xc3, 0x9d, 0x1f, 0x42, 0x5e, 0x3e, 0xca, + 0xcf, 0x43, 0x59, 0x42, 0x4e, 0x08, 0xb4, 0x4b, 0xa4, 0x2c, 0x7f, 0xf1, 0xb0, 0xc7, 0x02, 0xaa, + 0xa5, 0xf0, 0xca, 0x98, 0x79, 0x9d, 0x3e, 0x5d, 0x37, 0xb4, 0x34, 0xc7, 0x6d, 0x83, 0x39, 0x81, + 0x67, 0x1d, 0x6a, 0x19, 0x7e, 0x42, 0x79, 0xc0, 0x82, 0xcd, 0x51, 0x5b, 0xcb, 0xae, 0xfd, 0x2e, + 0x03, 0x2a, 0x4f, 0x9b, 0xdb, 0xd4, 0xdb, 0x67, 0x1d, 0x4a, 0xbe, 0x27, 0x7e, 0x18, 0x43, 0xe4, + 0x6c, 0xf8, 0xff, 0x2b, 0xe1, 0xc3, 0xf1, 0x42, 0x42, 0x26, 0x7f, 0x2a, 0x53, 0xfe, 0xf2, 0x4f, + 0x7f, 0xfb, 0x59, 0xba, 0x40, 0x72, 0xab, 0x43, 0x6e, 0x77, 0x3f, 0xfc, 0x51, 0x0a, 0x91, 0xd9, + 0x41, 0xb4, 0x22, 0x1f, 0x57, 0x66, 0xa4, 0xd2, 0xcb, 0x1c, 0x7a, 0x51, 0x48, 0x61, 0xd5, 0x17, + 0xd6, 0xdb, 0xb1, 0xdf, 0x6f, 0x90, 0x6b, 0x31, 0x74, 0x70, 0x41, 0xe4, 0x4d, 0x3f, 0xda, 0x21, + 0x1d, 0x2e, 0xa0, 0xc3, 0x32, 0x51, 0x57, 0x11, 0x4c, 0xcb, 0x9c, 0x03, 0xc8, 0xf0, 0xe8, 0xc3, + 0x38, 0xb9, 0x35, 0xe3, 0x42, 0xca, 0xa3, 0x21, 0xaa, 0x27, 0xf6, 0xcb, 0x91, 0xae, 0xe3, 0x48, + 0x57, 0xc8, 0x42, 0x6c, 0xa4, 0xe5, 0x5d, 0xe9, 0xbd, 0x37, 0xfb, 0x3b, 0x22, 0x72, 0x43, 0xb2, + 0x6b, 0x42, 0x1a, 0x8d, 0x76, 0xf3, 0x84, 0x5e, 0x39, 0xd6, 0x4b, 0x38, 0xd6, 0x02, 0x99, 0x5f, + 0xb5, 0xe9, 0xfe, 0xb2, 0x3d, 0x1a, 0x0c, 0x97, 0x5d, 0xa1, 0xd3, 0xf8, 0xbf, 0xaf, 0x27, 0xb7, + 0x52, 0xdf, 0x4c, 0x6e, 0xa5, 0xfe, 0x3a, 0xb9, 0x95, 0xfa, 0xea, 0xdb, 0x5b, 0x97, 0xbe, 0xf9, + 0xf6, 0xd6, 0xa5, 0x3f, 0x7f, 0x7b, 0xeb, 0xd2, 0x8f, 0x6e, 0xb6, 0xa9, 0x17, 0x1c, 0xae, 0x04, + 0xb4, 0xd3, 0x5b, 0xe5, 0xde, 0x57, 0xbb, 0xee, 0xea, 0x70, 0xaf, 0xbb, 0x2a, 0x7e, 0x84, 0xd5, + 0xce, 0x23, 0x57, 0xbc, 0xf3, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x65, 0xd8, 0xbf, 0xd2, 0x95, + 0x25, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3595,6 +3622,15 @@ func (m *MetadataOverride) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.HasMergeRequestID) > 0 { + i -= len(m.HasMergeRequestID) + copy(dAtA[i:], m.HasMergeRequestID) + i = encodeVarintYolopb(dAtA, i, uint64(len(m.HasMergeRequestID))) + i-- + dAtA[i] = 0x6 + i-- + dAtA[i] = 0xda + } if len(m.HasProjectID) > 0 { i -= len(m.HasProjectID) copy(dAtA[i:], m.HasProjectID) @@ -3728,6 +3764,15 @@ func (m *Build) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0xaa } } + if len(m.HasRawMergerequestID) > 0 { + i -= len(m.HasRawMergerequestID) + copy(dAtA[i:], m.HasRawMergerequestID) + i = encodeVarintYolopb(dAtA, i, uint64(len(m.HasRawMergerequestID))) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xda + } if len(m.HasRawProjectID) > 0 { i -= len(m.HasRawProjectID) copy(dAtA[i:], m.HasRawProjectID) @@ -3735,7 +3780,7 @@ func (m *Build) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0xca + dAtA[i] = 0xd2 } if len(m.HasRawCommitID) > 0 { i -= len(m.HasRawCommitID) @@ -3744,6 +3789,20 @@ func (m *Build) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x1 i-- + dAtA[i] = 0xca + } + if m.HasRawMergerequest != nil { + { + size, err := m.HasRawMergerequest.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintYolopb(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1 + i-- dAtA[i] = 0xc2 } if m.HasRawProject != nil { @@ -3824,22 +3883,22 @@ func (m *Build) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x52 } if m.FinishedAt != nil { - n15, err15 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.FinishedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.FinishedAt):]) - if err15 != nil { - return 0, err15 + n16, err16 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.FinishedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.FinishedAt):]) + if err16 != nil { + return 0, err16 } - i -= n15 - i = encodeVarintYolopb(dAtA, i, uint64(n15)) + i -= n16 + i = encodeVarintYolopb(dAtA, i, uint64(n16)) i-- dAtA[i] = 0x4a } if m.StartedAt != nil { - n16, err16 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.StartedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.StartedAt):]) - if err16 != nil { - return 0, err16 + n17, err17 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.StartedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.StartedAt):]) + if err17 != nil { + return 0, err17 } - i -= n16 - i = encodeVarintYolopb(dAtA, i, uint64(n16)) + i -= n17 + i = encodeVarintYolopb(dAtA, i, uint64(n17)) i-- dAtA[i] = 0x42 } @@ -3851,12 +3910,12 @@ func (m *Build) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x3a } if m.CompletedAt != nil { - n17, err17 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.CompletedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.CompletedAt):]) - if err17 != nil { - return 0, err17 + n18, err18 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.CompletedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.CompletedAt):]) + if err18 != nil { + return 0, err18 } - i -= n17 - i = encodeVarintYolopb(dAtA, i, uint64(n17)) + i -= n18 + i = encodeVarintYolopb(dAtA, i, uint64(n18)) i-- dAtA[i] = 0x32 } @@ -3866,22 +3925,22 @@ func (m *Build) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x28 } if m.UpdatedAt != nil { - n18, err18 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.UpdatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.UpdatedAt):]) - if err18 != nil { - return 0, err18 + n19, err19 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.UpdatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.UpdatedAt):]) + if err19 != nil { + return 0, err19 } - i -= n18 - i = encodeVarintYolopb(dAtA, i, uint64(n18)) + i -= n19 + i = encodeVarintYolopb(dAtA, i, uint64(n19)) i-- dAtA[i] = 0x22 } if m.CreatedAt != nil { - n19, err19 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.CreatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.CreatedAt):]) - if err19 != nil { - return 0, err19 + n20, err20 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.CreatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.CreatedAt):]) + if err20 != nil { + return 0, err20 } - i -= n19 - i = encodeVarintYolopb(dAtA, i, uint64(n19)) + i -= n20 + i = encodeVarintYolopb(dAtA, i, uint64(n20)) i-- dAtA[i] = 0x1a } @@ -4007,22 +4066,22 @@ func (m *Release) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x2a } if m.UpdatedAt != nil { - n23, err23 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.UpdatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.UpdatedAt):]) - if err23 != nil { - return 0, err23 + n24, err24 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.UpdatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.UpdatedAt):]) + if err24 != nil { + return 0, err24 } - i -= n23 - i = encodeVarintYolopb(dAtA, i, uint64(n23)) + i -= n24 + i = encodeVarintYolopb(dAtA, i, uint64(n24)) i-- dAtA[i] = 0x22 } if m.CreatedAt != nil { - n24, err24 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.CreatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.CreatedAt):]) - if err24 != nil { - return 0, err24 + n25, err25 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.CreatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.CreatedAt):]) + if err25 != nil { + return 0, err25 } - i -= n24 - i = encodeVarintYolopb(dAtA, i, uint64(n24)) + i -= n25 + i = encodeVarintYolopb(dAtA, i, uint64(n25)) i-- dAtA[i] = 0x1a } @@ -4157,22 +4216,22 @@ func (m *Commit) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x2a } if m.UpdatedAt != nil { - n28, err28 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.UpdatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.UpdatedAt):]) - if err28 != nil { - return 0, err28 + n29, err29 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.UpdatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.UpdatedAt):]) + if err29 != nil { + return 0, err29 } - i -= n28 - i = encodeVarintYolopb(dAtA, i, uint64(n28)) + i -= n29 + i = encodeVarintYolopb(dAtA, i, uint64(n29)) i-- dAtA[i] = 0x22 } if m.CreatedAt != nil { - n29, err29 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.CreatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.CreatedAt):]) - if err29 != nil { - return 0, err29 + n30, err30 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.CreatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.CreatedAt):]) + if err30 != nil { + return 0, err30 } - i -= n29 - i = encodeVarintYolopb(dAtA, i, uint64(n29)) + i -= n30 + i = encodeVarintYolopb(dAtA, i, uint64(n30)) i-- dAtA[i] = 0x1a } @@ -4409,33 +4468,33 @@ func (m *MergeRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x32 } if m.MergedAt != nil { - n33, err33 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.MergedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.MergedAt):]) - if err33 != nil { - return 0, err33 - } - i -= n33 - i = encodeVarintYolopb(dAtA, i, uint64(n33)) - i-- - dAtA[i] = 0x2a - } - if m.UpdatedAt != nil { - n34, err34 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.UpdatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.UpdatedAt):]) + n34, err34 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.MergedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.MergedAt):]) if err34 != nil { return 0, err34 } i -= n34 i = encodeVarintYolopb(dAtA, i, uint64(n34)) i-- - dAtA[i] = 0x22 + dAtA[i] = 0x2a } - if m.CreatedAt != nil { - n35, err35 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.CreatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.CreatedAt):]) + if m.UpdatedAt != nil { + n35, err35 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.UpdatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.UpdatedAt):]) if err35 != nil { return 0, err35 } i -= n35 i = encodeVarintYolopb(dAtA, i, uint64(n35)) i-- + dAtA[i] = 0x22 + } + if m.CreatedAt != nil { + n36, err36 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.CreatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.CreatedAt):]) + if err36 != nil { + return 0, err36 + } + i -= n36 + i = encodeVarintYolopb(dAtA, i, uint64(n36)) + i-- dAtA[i] = 0x1a } if len(m.YoloID) > 0 { @@ -4598,22 +4657,22 @@ func (m *Project) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x28 } if m.UpdatedAt != nil { - n37, err37 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.UpdatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.UpdatedAt):]) - if err37 != nil { - return 0, err37 + n38, err38 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.UpdatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.UpdatedAt):]) + if err38 != nil { + return 0, err38 } - i -= n37 - i = encodeVarintYolopb(dAtA, i, uint64(n37)) + i -= n38 + i = encodeVarintYolopb(dAtA, i, uint64(n38)) i-- dAtA[i] = 0x22 } if m.CreatedAt != nil { - n38, err38 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.CreatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.CreatedAt):]) - if err38 != nil { - return 0, err38 + n39, err39 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.CreatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.CreatedAt):]) + if err39 != nil { + return 0, err39 } - i -= n38 - i = encodeVarintYolopb(dAtA, i, uint64(n38)) + i -= n39 + i = encodeVarintYolopb(dAtA, i, uint64(n39)) i-- dAtA[i] = 0x1a } @@ -4734,22 +4793,22 @@ func (m *Entity) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x2a } if m.UpdatedAt != nil { - n39, err39 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.UpdatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.UpdatedAt):]) - if err39 != nil { - return 0, err39 + n40, err40 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.UpdatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.UpdatedAt):]) + if err40 != nil { + return 0, err40 } - i -= n39 - i = encodeVarintYolopb(dAtA, i, uint64(n39)) + i -= n40 + i = encodeVarintYolopb(dAtA, i, uint64(n40)) i-- dAtA[i] = 0x22 } if m.CreatedAt != nil { - n40, err40 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.CreatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.CreatedAt):]) - if err40 != nil { - return 0, err40 + n41, err41 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.CreatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.CreatedAt):]) + if err41 != nil { + return 0, err41 } - i -= n40 - i = encodeVarintYolopb(dAtA, i, uint64(n40)) + i -= n41 + i = encodeVarintYolopb(dAtA, i, uint64(n41)) i-- dAtA[i] = 0x1a } @@ -4965,22 +5024,22 @@ func (m *Artifact) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x28 } if m.UpdatedAt != nil { - n43, err43 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.UpdatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.UpdatedAt):]) - if err43 != nil { - return 0, err43 + n44, err44 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.UpdatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.UpdatedAt):]) + if err44 != nil { + return 0, err44 } - i -= n43 - i = encodeVarintYolopb(dAtA, i, uint64(n43)) + i -= n44 + i = encodeVarintYolopb(dAtA, i, uint64(n44)) i-- dAtA[i] = 0x22 } if m.CreatedAt != nil { - n44, err44 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.CreatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.CreatedAt):]) - if err44 != nil { - return 0, err44 + n45, err45 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.CreatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.CreatedAt):]) + if err45 != nil { + return 0, err45 } - i -= n44 - i = encodeVarintYolopb(dAtA, i, uint64(n44)) + i -= n45 + i = encodeVarintYolopb(dAtA, i, uint64(n45)) i-- dAtA[i] = 0x1a } @@ -5045,12 +5104,12 @@ func (m *Download) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0xaa } if m.CreatedAt != nil { - n46, err46 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.CreatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.CreatedAt):]) - if err46 != nil { - return 0, err46 + n47, err47 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.CreatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.CreatedAt):]) + if err47 != nil { + return 0, err47 } - i -= n46 - i = encodeVarintYolopb(dAtA, i, uint64(n46)) + i -= n47 + i = encodeVarintYolopb(dAtA, i, uint64(n47)) i-- dAtA[i] = 0x12 } @@ -5479,6 +5538,10 @@ func (m *MetadataOverride) Size() (n int) { if l > 0 { n += 2 + l + sovYolopb(uint64(l)) } + l = len(m.HasMergeRequestID) + if l > 0 { + n += 2 + l + sovYolopb(uint64(l)) + } return n } @@ -5558,6 +5621,10 @@ func (m *Build) Size() (n int) { l = m.HasRawProject.Size() n += 2 + l + sovYolopb(uint64(l)) } + if m.HasRawMergerequest != nil { + l = m.HasRawMergerequest.Size() + n += 2 + l + sovYolopb(uint64(l)) + } l = len(m.HasRawCommitID) if l > 0 { n += 2 + l + sovYolopb(uint64(l)) @@ -5566,6 +5633,10 @@ func (m *Build) Size() (n int) { if l > 0 { n += 2 + l + sovYolopb(uint64(l)) } + l = len(m.HasRawMergerequestID) + if l > 0 { + n += 2 + l + sovYolopb(uint64(l)) + } if len(m.HasArtifacts) > 0 { for _, e := range m.HasArtifacts { l = e.Size() @@ -7973,6 +8044,38 @@ func (m *MetadataOverride) Unmarshal(dAtA []byte) error { } m.HasProjectID = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 107: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field HasMergeRequestID", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowYolopb + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthYolopb + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthYolopb + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.HasMergeRequestID = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipYolopb(dAtA[iNdEx:]) @@ -8605,6 +8708,42 @@ func (m *Build) Unmarshal(dAtA []byte) error { } iNdEx = postIndex case 24: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field HasRawMergerequest", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowYolopb + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthYolopb + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthYolopb + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.HasRawMergerequest == nil { + m.HasRawMergerequest = &MergeRequest{} + } + if err := m.HasRawMergerequest.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 25: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field HasRawCommitID", wireType) } @@ -8636,7 +8775,7 @@ func (m *Build) Unmarshal(dAtA []byte) error { } m.HasRawCommitID = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 25: + case 26: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field HasRawProjectID", wireType) } @@ -8668,6 +8807,38 @@ func (m *Build) Unmarshal(dAtA []byte) error { } m.HasRawProjectID = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 27: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field HasRawMergerequestID", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowYolopb + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthYolopb + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthYolopb + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.HasRawMergerequestID = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex case 101: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field HasArtifacts", wireType) diff --git a/go/pkg/yolostore/store.go b/go/pkg/yolostore/store.go index 140a0a07..6a074973 100644 --- a/go/pkg/yolostore/store.go +++ b/go/pkg/yolostore/store.go @@ -316,6 +316,7 @@ func (s *store) GetBuildList(bl GetBuildListOpts) ([]*yolopb.Build, error) { Preload("HasRawProject"). Preload("HasProject.HasOwner"). Preload("HasMergerequest"). + Preload("HasRawMergerequest"). Preload("HasMergerequest.HasProject"). Preload("HasMergerequest.HasAuthor"). Preload("HasMergerequest.HasCommit"). diff --git a/go/pkg/yolosvc/driver_github.go b/go/pkg/yolosvc/driver_github.go index 739e504e..07b37960 100644 --- a/go/pkg/yolosvc/driver_github.go +++ b/go/pkg/yolosvc/driver_github.go @@ -440,9 +440,16 @@ func (worker *githubWorker) batchFromWorkflowRun(run *github.WorkflowRun, prs [] Message: run.GetHeadCommit().GetMessage(), } + if len(prs) > 0 { + pr := prs[0] // only take the first one + newBuild.HasMergerequestID = pr.GetHTMLURL() + newBuild.HasRawMergerequestID = pr.GetHTMLURL() + } + if override != nil { newBuild.ApplyMetadataOverride(override) } + if run.GetConclusion() != "" { newBuild.FinishedAt = &updatedAt // maybe we can have a more accurate date? } @@ -486,11 +493,6 @@ func (worker *githubWorker) batchFromWorkflowRun(run *github.WorkflowRun, prs [] } } - if len(prs) > 0 { - pr := prs[0] // only take the first one - newBuild.HasMergerequestID = pr.GetHTMLURL() - } - guessMissingBuildInfo(&newBuild) batch.Builds = append(batch.Builds, &newBuild) return batch