fix(proto): keep failing_checks_block as a deprecated field instead of removing it
2 files · +20 -6
M gen/ermite/repo.pb.go +17 -3
| @@ -146,6 +146,11 @@ type RepoSettings struct { | |||
| 146 | 146 | // duplicate. Every mode is allowed by default. MERGE_MODE_UNSPECIFIED is | |
| 147 | 147 | // rejected. | |
| 148 | 148 | AllowedMergeModes []MergeMode `protobuf:"varint,1,rep,packed,name=allowed_merge_modes,json=allowedMergeModes,proto3,enum=ermite.MergeMode" json:"allowed_merge_modes,omitempty"` | |
| 149 | + | // FailingChecksBlock is unused: servers ignore it and never set it. A merge | |
| 150 | + | // needs passing checks unless MergeMergeRequestRequest.ignore_checks is set. | |
| 151 | + | // | |
| 152 | + | // Deprecated: Marked as deprecated in ermite/repo.proto. | |
| 153 | + | FailingChecksBlock bool `protobuf:"varint,2,opt,name=failing_checks_block,json=failingChecksBlock,proto3" json:"failing_checks_block,omitempty"` | |
| 149 | 154 | // Issues is the issue participation mode of the repository. | |
| 150 | 155 | Issues IssuesMode `protobuf:"varint,3,opt,name=issues,proto3,enum=ermite.IssuesMode" json:"issues,omitempty"` | |
| 151 | 156 | // AllowAutoMerge says whether auto-merge can be enabled on the merge requests | |
| @@ -193,6 +198,14 @@ func (x *RepoSettings) GetAllowedMergeModes() []MergeMode { | |||
| 193 | 198 | return nil | |
| 194 | 199 | } | |
| 195 | 200 | ||
| 201 | + | // Deprecated: Marked as deprecated in ermite/repo.proto. | |
| 202 | + | func (x *RepoSettings) GetFailingChecksBlock() bool { | |
| 203 | + | if x != nil { | |
| 204 | + | return x.FailingChecksBlock | |
| 205 | + | } | |
| 206 | + | return false | |
| 207 | + | } | |
| 208 | + | ||
| 196 | 209 | func (x *RepoSettings) GetIssues() IssuesMode { | |
| 197 | 210 | if x != nil { | |
| 198 | 211 | return x.Issues | |
| @@ -910,11 +923,12 @@ var File_ermite_repo_proto protoreflect.FileDescriptor | |||
| 910 | 923 | ||
| 911 | 924 | const file_ermite_repo_proto_rawDesc = "" + | |
| 912 | 925 | "\n" + | |
| 913 | - | "\x11ermite/repo.proto\x12\x06ermite\x1a google/protobuf/field_mask.proto\x1a\x12ermite/types.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xc3\x01\n" + | |
| 926 | + | "\x11ermite/repo.proto\x12\x06ermite\x1a google/protobuf/field_mask.proto\x1a\x12ermite/types.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xdd\x01\n" + | |
| 914 | 927 | "\fRepoSettings\x12A\n" + | |
| 915 | - | "\x13allowed_merge_modes\x18\x01 \x03(\x0e2\x11.ermite.MergeModeR\x11allowedMergeModes\x12*\n" + | |
| 928 | + | "\x13allowed_merge_modes\x18\x01 \x03(\x0e2\x11.ermite.MergeModeR\x11allowedMergeModes\x124\n" + | |
| 929 | + | "\x14failing_checks_block\x18\x02 \x01(\bB\x02\x18\x01R\x12failingChecksBlock\x12*\n" + | |
| 916 | 930 | "\x06issues\x18\x03 \x01(\x0e2\x12.ermite.IssuesModeR\x06issues\x12(\n" + | |
| 917 | - | "\x10allow_auto_merge\x18\x04 \x01(\bR\x0eallowAutoMergeJ\x04\b\x02\x10\x03R\x14failing_checks_block\"\xd5\x02\n" + | |
| 931 | + | "\x10allow_auto_merge\x18\x04 \x01(\bR\x0eallowAutoMerge\"\xd5\x02\n" + | |
| 918 | 932 | "\x04Repo\x12\x12\n" + | |
| 919 | 933 | "\x04name\x18\x01 \x01(\tR\x04name\x12 \n" + | |
| 920 | 934 | "\vdescription\x18\x02 \x01(\tR\vdescription\x122\n" + | |
| @@ -146,6 +146,11 @@ type RepoSettings struct { | |||||
| 146 | // duplicate. Every mode is allowed by default. MERGE_MODE_UNSPECIFIED is | 146 | // duplicate. Every mode is allowed by default. MERGE_MODE_UNSPECIFIED is | ||
| 147 | // rejected. | 147 | // rejected. | ||
| 148 | AllowedMergeModes []MergeMode `protobuf:"varint,1,rep,packed,name=allowed_merge_modes,json=allowedMergeModes,proto3,enum=ermite.MergeMode" json:"allowed_merge_modes,omitempty"` | 148 | AllowedMergeModes []MergeMode `protobuf:"varint,1,rep,packed,name=allowed_merge_modes,json=allowedMergeModes,proto3,enum=ermite.MergeMode" json:"allowed_merge_modes,omitempty"` | ||
| 149 | + | // FailingChecksBlock is unused: servers ignore it and never set it. A merge | |||
| 150 | + | // needs passing checks unless MergeMergeRequestRequest.ignore_checks is set. | |||
| 151 | + | // | |||
| 152 | + | // Deprecated: Marked as deprecated in ermite/repo.proto. | |||
| 153 | + | FailingChecksBlock bool `protobuf:"varint,2,opt,name=failing_checks_block,json=failingChecksBlock,proto3" json:"failing_checks_block,omitempty"` | |||
| 149 | // Issues is the issue participation mode of the repository. | 154 | // Issues is the issue participation mode of the repository. | ||
| 150 | Issues IssuesMode `protobuf:"varint,3,opt,name=issues,proto3,enum=ermite.IssuesMode" json:"issues,omitempty"` | 155 | Issues IssuesMode `protobuf:"varint,3,opt,name=issues,proto3,enum=ermite.IssuesMode" json:"issues,omitempty"` | ||
| 151 | // AllowAutoMerge says whether auto-merge can be enabled on the merge requests | 156 | // AllowAutoMerge says whether auto-merge can be enabled on the merge requests | ||
| @@ -193,6 +198,14 @@ func (x *RepoSettings) GetAllowedMergeModes() []MergeMode { | |||||
| 193 | return nil | 198 | return nil | ||
| 194 | } | 199 | } | ||
| 195 | 200 | ||||
| 201 | + | // Deprecated: Marked as deprecated in ermite/repo.proto. | |||
| 202 | + | func (x *RepoSettings) GetFailingChecksBlock() bool { | |||
| 203 | + | if x != nil { | |||
| 204 | + | return x.FailingChecksBlock | |||
| 205 | + | } | |||
| 206 | + | return false | |||
| 207 | + | } | |||
| 208 | + | ||||
| 196 | func (x *RepoSettings) GetIssues() IssuesMode { | 209 | func (x *RepoSettings) GetIssues() IssuesMode { | ||
| 197 | if x != nil { | 210 | if x != nil { | ||
| 198 | return x.Issues | 211 | return x.Issues | ||
| @@ -910,11 +923,12 @@ var File_ermite_repo_proto protoreflect.FileDescriptor | |||||
| 910 | 923 | ||||
| 911 | const file_ermite_repo_proto_rawDesc = "" + | 924 | const file_ermite_repo_proto_rawDesc = "" + | ||
| 912 | "\n" + | 925 | "\n" + | ||
| 913 | - | "\x11ermite/repo.proto\x12\x06ermite\x1a google/protobuf/field_mask.proto\x1a\x12ermite/types.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xc3\x01\n" + | 926 | + | "\x11ermite/repo.proto\x12\x06ermite\x1a google/protobuf/field_mask.proto\x1a\x12ermite/types.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xdd\x01\n" + |
| 914 | "\fRepoSettings\x12A\n" + | 927 | "\fRepoSettings\x12A\n" + | ||
| 915 | - | "\x13allowed_merge_modes\x18\x01 \x03(\x0e2\x11.ermite.MergeModeR\x11allowedMergeModes\x12*\n" + | 928 | + | "\x13allowed_merge_modes\x18\x01 \x03(\x0e2\x11.ermite.MergeModeR\x11allowedMergeModes\x124\n" + |
| 929 | + | "\x14failing_checks_block\x18\x02 \x01(\bB\x02\x18\x01R\x12failingChecksBlock\x12*\n" + | |||
| 916 | "\x06issues\x18\x03 \x01(\x0e2\x12.ermite.IssuesModeR\x06issues\x12(\n" + | 930 | "\x06issues\x18\x03 \x01(\x0e2\x12.ermite.IssuesModeR\x06issues\x12(\n" + | ||
| 917 | - | "\x10allow_auto_merge\x18\x04 \x01(\bR\x0eallowAutoMergeJ\x04\b\x02\x10\x03R\x14failing_checks_block\"\xd5\x02\n" + | 931 | + | "\x10allow_auto_merge\x18\x04 \x01(\bR\x0eallowAutoMerge\"\xd5\x02\n" + |
| 918 | "\x04Repo\x12\x12\n" + | 932 | "\x04Repo\x12\x12\n" + | ||
| 919 | "\x04name\x18\x01 \x01(\tR\x04name\x12 \n" + | 933 | "\x04name\x18\x01 \x01(\tR\x04name\x12 \n" + | ||
| 920 | "\vdescription\x18\x02 \x01(\tR\vdescription\x122\n" + | 934 | "\vdescription\x18\x02 \x01(\tR\vdescription\x122\n" + | ||
M proto/ermite/repo.proto +3 -3
| @@ -35,14 +35,14 @@ enum IssuesMode { | |||
| 35 | 35 | // RepoSettings are the settings of a repository that govern its merge | |
| 36 | 36 | // requests and issues. | |
| 37 | 37 | message RepoSettings { | |
| 38 | - | reserved 2; | |
| 39 | - | reserved "failing_checks_block"; | |
| 40 | - | ||
| 41 | 38 | // AllowedMergeModes are the modes with which a merge request of the | |
| 42 | 39 | // repository may be merged. It is never empty in a response and has no | |
| 43 | 40 | // duplicate. Every mode is allowed by default. MERGE_MODE_UNSPECIFIED is | |
| 44 | 41 | // rejected. | |
| 45 | 42 | repeated MergeMode allowed_merge_modes = 1; | |
| 43 | + | // FailingChecksBlock is unused: servers ignore it and never set it. A merge | |
| 44 | + | // needs passing checks unless MergeMergeRequestRequest.ignore_checks is set. | |
| 45 | + | bool failing_checks_block = 2 [deprecated = true]; | |
| 46 | 46 | // Issues is the issue participation mode of the repository. | |
| 47 | 47 | IssuesMode issues = 3; | |
| 48 | 48 | // AllowAutoMerge says whether auto-merge can be enabled on the merge requests | |
| @@ -35,14 +35,14 @@ enum IssuesMode { | |||||
| 35 | // RepoSettings are the settings of a repository that govern its merge | 35 | // RepoSettings are the settings of a repository that govern its merge | ||
| 36 | // requests and issues. | 36 | // requests and issues. | ||
| 37 | message RepoSettings { | 37 | message RepoSettings { | ||
| 38 | - | reserved 2; | |||
| 39 | - | reserved "failing_checks_block"; | |||
| 40 | - | ||||
| 41 | // AllowedMergeModes are the modes with which a merge request of the | 38 | // AllowedMergeModes are the modes with which a merge request of the | ||
| 42 | // repository may be merged. It is never empty in a response and has no | 39 | // repository may be merged. It is never empty in a response and has no | ||
| 43 | // duplicate. Every mode is allowed by default. MERGE_MODE_UNSPECIFIED is | 40 | // duplicate. Every mode is allowed by default. MERGE_MODE_UNSPECIFIED is | ||
| 44 | // rejected. | 41 | // rejected. | ||
| 45 | repeated MergeMode allowed_merge_modes = 1; | 42 | repeated MergeMode allowed_merge_modes = 1; | ||
| 43 | + | // FailingChecksBlock is unused: servers ignore it and never set it. A merge | |||
| 44 | + | // needs passing checks unless MergeMergeRequestRequest.ignore_checks is set. | |||
| 45 | + | bool failing_checks_block = 2 [deprecated = true]; | |||
| 46 | // Issues is the issue participation mode of the repository. | 46 | // Issues is the issue participation mode of the repository. | ||
| 47 | IssuesMode issues = 3; | 47 | IssuesMode issues = 3; | ||
| 48 | // AllowAutoMerge says whether auto-merge can be enabled on the merge requests | 48 | // AllowAutoMerge says whether auto-merge can be enabled on the merge requests | ||