Skip to content

examples: pin version of go-control-plane (#17553)#17683

Merged
ggreenway merged 3 commits intoenvoyproxy:release/v1.19from
ggreenway:1.19-fix-verify-examples
Aug 12, 2021
Merged

examples: pin version of go-control-plane (#17553)#17683
ggreenway merged 3 commits intoenvoyproxy:release/v1.19from
ggreenway:1.19-fix-verify-examples

Conversation

@ggreenway
Copy link
Copy Markdown
Member

Attempting to fix CI in the release/v1.19 branch.

Co-authored-by: Snow Pettersen snowp@lyft.com
(cherry picked from commit 38b6fd5, PR #17553)
Signed-off-by: Greg Greenway ggreenway@apple.com

Commit Message:
Additional Description:
Risk Level:
Testing:
Docs Changes:
Release Notes:
Platform Specific Features:
[Optional Runtime guard:]
[Optional Fixes #Issue]
[Optional Deprecated:]
[Optional API Considerations:]

Co-authored-by: Snow Pettersen <snowp@lyft.com>
(cherry picked from commit 38b6fd5, PR envoyproxy#17553)
Signed-off-by: Greg Greenway <ggreenway@apple.com>
Signed-off-by: Greg Greenway <ggreenway@apple.com>
Copy link
Copy Markdown
Contributor

@snowp snowp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

With the previous order, the `git checkout` failed saying it would
overwrite resource.go changes

Signed-off-by: Greg Greenway <ggreenway@apple.com>
@ggreenway
Copy link
Copy Markdown
Member Author

@snowp That version had an error from the git checkout saying it was overwriting local changes to resource.go. I think my latest commit will fix it; we may want to apply that on main. I think it'll break on main next time resource.go changes in go-control-plane.

@ggreenway ggreenway merged commit f5ccbc8 into envoyproxy:release/v1.19 Aug 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants