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

Revert "move compile time version information (#6050)" #6087

Merged
merged 1 commit into from
Jan 16, 2018

Conversation

graphaelli
Copy link
Member

Temporarily remove version info that is not provided by the current release process.

before:

$ ./libbeat version 
mockbeat version 9.9.9 (amd64), libbeat 6.2.0 [unknown built unknown]

after:

$ ./libbeat version
mockbeat version 9.9.9 (amd64), libbeat 6.2.0

for #6051

This reverts commit a3970ee.

Revert "Include build time and revision in version information (elastic#5973)"

This reverts commit 54d6b4c.
@ruflin ruflin merged commit b9fefe1 into elastic:6.x Jan 16, 2018
@ruflin
Copy link
Contributor

ruflin commented Jan 16, 2018

@graphaelli Did you investigate on why it's not in 6.2? Lets see if we can get this later in again for the next 6.x releases.

@graphaelli
Copy link
Member Author

I ran out of time to investigate. I assume something in the package target does a go build directly rather than relying on the ${BEAT_NAME} name. I imagine we need that for cgo to work. I'll follow up with you directly.

@graphaelli graphaelli deleted the 6.x-revert-revision-info branch January 17, 2018 02:00
@graphaelli
Copy link
Member Author

@ruflin I can't find an issue for fixing this, but I have a fix (updates to dev-tools/packer/docker/xgo-image/beats-builder/build.sh) that works for the linux package, and I think the windows package (haven't tested directly), but doesn't work for darwin. I'll ask for help if I can't figure it out.

@graphaelli
Copy link
Member Author

figured it out, can only provide one -ldflags arg to go build, last one wins

graphaelli added a commit to graphaelli/beats that referenced this pull request Mar 22, 2018
andrewkroh pushed a commit that referenced this pull request Mar 22, 2018
…" (#6630)

Reverse the temporary revert we did directly on 6.x until #6360 went in.  This change syncs these files with what is on `master`.

Double checked with `make` and `make package` artifacts.

This reverts commit b9fefe1.
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