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

Upport kokoro/release/python from 3.6.x branch #5125

Conversation

jtattermusch
Copy link
Contributor

That directory is missing in upstream/master so the artifact builds are failing:

[09:11:59][ERROR] Failed to get build config
com.google.devtools.kokoro.config.ConfigException: Build config /tmp/workspace/workspace/protobuf/github/master/release/python/macos/release/src/github/protobuf/kokoro/release/python/macos/release.cfg does not exist

Copying the missing files from 3.6.x branch.

@xfxyjwf
Copy link
Contributor

xfxyjwf commented Sep 7, 2018

@acozzette @TeBoring Should we do a merge from 3.6.x to master?

@xfxyjwf xfxyjwf added the cleanup label Sep 7, 2018
@acozzette
Copy link
Member

@xfxyjwf That sounds like a good idea, that way we will make sure to pick up any other fixes that might have been made on 3.6.x but which haven't made it to master yet.

@jtattermusch jtattermusch merged commit f8d56e9 into protocolbuffers:master Sep 7, 2018
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.

4 participants