Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
12e4c80d1a | |||
|
5ebe248b19 | ||
|
e7d372062c |
2
.github/workflows/dependabot-automerge.yml
vendored
2
.github/workflows/dependabot-automerge.yml
vendored
@@ -25,7 +25,7 @@ jobs:
|
|||||||
|| (github.event.workflow_run.event == 'push' && github.event.workflow_run.pull_requests[0].base.ref == github.event.repository.default_branch ))
|
|| (github.event.workflow_run.event == 'push' && github.event.workflow_run.pull_requests[0].base.ref == github.event.repository.default_branch ))
|
||||||
steps:
|
steps:
|
||||||
- name: Approve Changes and Merge changes if label 'dependencies' is set
|
- name: Approve Changes and Merge changes if label 'dependencies' is set
|
||||||
uses: actions/github-script@v4
|
uses: actions/github-script@v5
|
||||||
with:
|
with:
|
||||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
script: |
|
script: |
|
||||||
|
@@ -38,14 +38,14 @@ func (c *protoCodec) Marshal(v interface{}, opts ...codec.Option) ([]byte, error
|
|||||||
return m.Data, nil
|
return m.Data, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
switch v.(type) {
|
switch m := v.(type) {
|
||||||
case proto.Message, newproto.Message:
|
case proto.Message:
|
||||||
break
|
return proto.Marshal(m)
|
||||||
default:
|
case newproto.Message:
|
||||||
return nil, codec.ErrInvalidMessage
|
return proto.Marshal(m)
|
||||||
}
|
}
|
||||||
|
|
||||||
return proto.Marshal(v.(proto.Message))
|
return nil, codec.ErrInvalidMessage
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *protoCodec) Unmarshal(d []byte, v interface{}, opts ...codec.Option) error {
|
func (c *protoCodec) Unmarshal(d []byte, v interface{}, opts ...codec.Option) error {
|
||||||
@@ -67,14 +67,15 @@ func (c *protoCodec) Unmarshal(d []byte, v interface{}, opts ...codec.Option) er
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
switch v.(type) {
|
switch m := v.(type) {
|
||||||
case proto.Message, newproto.Message:
|
case proto.Message:
|
||||||
break
|
return proto.Unmarshal(d, m)
|
||||||
default:
|
case newproto.Message:
|
||||||
return codec.ErrInvalidMessage
|
return proto.Unmarshal(d, m)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return proto.Unmarshal(d, v.(proto.Message))
|
return codec.ErrInvalidMessage
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *protoCodec) ReadHeader(conn io.Reader, m *codec.Message, t codec.MessageType) error {
|
func (c *protoCodec) ReadHeader(conn io.Reader, m *codec.Message, t codec.MessageType) error {
|
||||||
|
Reference in New Issue
Block a user