Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix usage of six in //:protobuf_python rule and add import #6310

Merged
merged 3 commits into from
Jul 15, 2019

Conversation

aaliddell
Copy link
Contributor

Using //external:six works when protobuf is the root repo, but fails when protobuf is a third party dependency of another workspace. @six//:six works in both situations once the relevant workspace rule has been updated to match.

Also added six to the protobuf_deps.bzl file.

@BSBandme
Copy link
Contributor

BSBandme commented Jul 1, 2019

Please fix the test errors.

@aaliddell
Copy link
Contributor Author

The four failed so far do not appear to be failed tests. Each has the error [14:03:29][ERROR] Cannot check out non-mergeable pull request as if merged., yet Mergeable, GitHub and the other pipelines seem to think it's conflict free.

So I don't see what I can do to resolve this when the actual tests themselves run fine in the other pipelines? Do you want a rebase or master-merge?

@BSBandme
Copy link
Contributor

BSBandme commented Jul 1, 2019

Alright... Seems it has some errors during last run.
Let's wait for the rerun result though.

@aaliddell
Copy link
Contributor Author

Looks OK on the second time through 🤔

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants