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

Minor change to build.py #262

Merged
merged 4 commits into from
Mar 3, 2016
Merged

Minor change to build.py #262

merged 4 commits into from
Mar 3, 2016

Conversation

rossmcdonald
Copy link
Contributor

This change brings back parity to InfluxDB build script.

@nathanielc
Copy link
Contributor

+1 on green, Thanks a ton for keeping these in sync. Have you tried the kapacitor -> influxdb port yet? do you need any help?

@rossmcdonald
Copy link
Contributor Author

@nathanielc I merged the bulk of the changes yesterday with influxdata/influxdb#5596, but this should be the last one needed to get everything in sync. I think I have everything under control for now, but I'll let you know if things get too complicated.

@nathanielc
Copy link
Contributor

Great, second commit looks good too. Thanks

@rossmcdonald
Copy link
Contributor Author

Hmm, failure here was:

There are un-committed changes in your local branch, --no-stash was given, cannot continue

Which was originally getting skipped, but is now handled. I don't know why there would be un-committed changes in the directory, though.

@nathanielc
Copy link
Contributor

Go generate must have changed some files, meaning the committed ones are out of date with the source of the generated files. Which is a valid reason to stop the build. I'll see if I can figure out what is up.

@rossmcdonald
Copy link
Contributor Author

Same failure. I'm guessing this is from the changes made by go generate? Should --no-stash be given if generate is called?

@rossmcdonald
Copy link
Contributor Author

Ah, that makes sense.

@rossmcdonald
Copy link
Contributor Author

@nathanielc I added debug output to the build command. It's more verbose and shows the underlying commands being run, which should hopefully help a little with debugging. Let me know if you have any concerns, or want to leave it as-is.

@rossmcdonald
Copy link
Contributor Author

Files that changed are:

 M vendor/github.com/influxdb/influxdb/cluster/internal/data.pb.go
 M vendor/github.com/influxdb/influxdb/services/copier/internal/internal.pb.go
 M vendor/github.com/influxdb/influxdb/services/meta/internal/meta.pb.go
 M vendor/github.com/influxdb/influxdb/tsdb/internal/meta.pb.go

@nathanielc
Copy link
Contributor

Hmm, I'll fix that....

On Fri, Feb 26, 2016 at 11:31 AM, Ross McDonald notifications@github.com
wrote:

Files that changed are:

M vendor/github.com/influxdb/influxdb/cluster/internal/data.pb.go
M vendor/github.com/influxdb/influxdb/services/copier/internal/internal.pb.go
M vendor/github.com/influxdb/influxdb/services/meta/internal/meta.pb.go
M vendor/github.com/influxdb/influxdb/tsdb/internal/meta.pb.go


Reply to this email directly or view it on GitHub
#262 (comment).

Nathaniel Cook
Kapacitor Lead
▼▴

InfluxData.com http://influxdata.com/

Twitter http://www.twitter.com/nathanielvcook

@nathanielc nathanielc force-pushed the ross-build-updates branch from 35b3216 to 6d135f6 Compare March 2, 2016 19:33
@nathanielc
Copy link
Contributor

@rossmcdonald I fixed the go generate issue, now something else is broken. Looks like the test deps didn't get installed.

Ross McDonald and others added 3 commits March 3, 2016 08:40
- updated the test function
- cleaned up 'go generate' call
- added debug output to circle builds
- added more verbose debug output to commands
@rossmcdonald
Copy link
Contributor Author

@nathanielc Test dependency issue resolved! I also squashed a few commits. Assuming the latest check passes, I think this is ready to go.

nathanielc pushed a commit that referenced this pull request Mar 3, 2016
@nathanielc nathanielc merged commit a5cf89b into master Mar 3, 2016
@nathanielc nathanielc deleted the ross-build-updates branch March 3, 2016 22:36
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.

2 participants