Skip to content

resolve rules_go conflict#43

Merged
htuch merged 1 commit intocncf:masterfrom
kyessenov:fix_rules_go
Dec 11, 2020
Merged

resolve rules_go conflict#43
htuch merged 1 commit intocncf:masterfrom
kyessenov:fix_rules_go

Conversation

@kyessenov
Copy link
Contributor

Needed by envoyproxy/envoy#14253

Signed-off-by: Kuat Yessenov kuat@google.com

Signed-off-by: Kuat Yessenov <kuat@google.com>
@kyessenov
Copy link
Contributor Author

/assign @htuch

@moderation
Copy link

I think this will unblock us bumping the rules_go and Go versions in Envoy which is great. Thanks

@kyessenov
Copy link
Contributor Author

@moderation There are other dependencies with conflicts, but this one is a real blocker. The others can be done in follow ups.

@htuch htuch merged commit cc1b757 into cncf:master Dec 11, 2020
@moderation
Copy link

@kyessenov I can confirm there are still conflicts after using this commit. Unable to use Go 1.15.5 with rules_go 0.24.9 and unable to use rules_go 0.25.0 with any version of Go /cc @htuch

@kyessenov
Copy link
Contributor Author

It's a painful process of changing every protobuf/ptypes dependency to rules_go. This works for core envoy types and PGV, but needs follow up for opencensus, etc. This is the right thing to do anyways, we've just been procrastinating.

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.

3 participants